From patchwork Thu Jul 27 05:14:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "\(Exiting\) Baolin Wang" X-Patchwork-Id: 108810 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp1625008qge; Wed, 26 Jul 2017 22:16:12 -0700 (PDT) X-Received: by 10.98.76.201 with SMTP id e70mr3028048pfj.262.1501132572285; Wed, 26 Jul 2017 22:16:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501132572; cv=none; d=google.com; s=arc-20160816; b=o6CyzTW0D+XVslQbwmXSgz6oISmjbMNH0Q0CpOL+NgN5Rpz2SLboHpWXxiIQfHasMr QDYvNcZ8OjhlovjUgAF7kAEE1hMXFMmnf8rp/iGdcrIWbSYY37JLJAXUs2nrP/f80IJq 3P1FkGBYqWfcygap3Nz1lUyIuuguqwwX/ClxETSCVttQFM9nviCG+iygV+z8ODvlqBue xo74+BgJW37Z/li0QodBMF38b+HSSul2GLy9c0RrRgijZ8PwMq/UnN327bNi1s/XW8wO VPHXuMuhO2rKfuU8iJ49oih5ij0VTe8ARAHi6JXFZl+a2E8wMX8/JeDaYJcdz+OTHpPW CKFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=N9r5VEQXKz5m+Eensbdev1yPt9+TbahPK+INcDIqZFE=; b=KZ8nASw3xydmo9NiZcEYpp6q+0HngvBl5OebohmqLNcBXsy7hAERyme1j0Q+zT+lkJ SWXMXsDjCskIJ1I3/woBWUAGuLRJJacAaJFYXazmLleJkWk86RkexLaBUziqGGcFsqn7 6sh820N8fhi9onEQhjK6MVXD/NDzYO2Od5a/u4dKhw6oKwlEiaGLSRJAK1+yGMjugKUL QVnfA4DMpwGtnAcbZ5uhyu2LAIAVJWxx7xYTPIiC0Ig7XabXT58+j3qveg5vK3PhwXfY zcyxAbFkLaob3CUfrFUrwqyhAzzeAuZ8bIl3KNaGwHDWNF9ALoL4lRG05rpjyH0WzXdi mKhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=keiPWwvY; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e81si10488287pfb.482.2017.07.26.22.16.11; Wed, 26 Jul 2017 22:16:12 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.b=keiPWwvY; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751857AbdG0FQJ (ORCPT + 26 others); Thu, 27 Jul 2017 01:16:09 -0400 Received: from mail-pf0-f174.google.com ([209.85.192.174]:33074 "EHLO mail-pf0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751647AbdG0FPG (ORCPT ); Thu, 27 Jul 2017 01:15:06 -0400 Received: by mail-pf0-f174.google.com with SMTP id d67so11256047pfc.0 for ; Wed, 26 Jul 2017 22:15:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=N9r5VEQXKz5m+Eensbdev1yPt9+TbahPK+INcDIqZFE=; b=keiPWwvYpLIQU9g73DfhWb8CsXVIw983viGupVyTTHC9Ljp+2a7LOO1CKnP1HlcK4y xxpuZHTRjExeORHhbzT0Q4mngifJ6pA0U+huZtXPx8nJIQhfmK9AVAHEBWz4TNbooYNF pI4O3S+JuFHLJvs26rLaAOO9ZazYBOtZ4UdAU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=N9r5VEQXKz5m+Eensbdev1yPt9+TbahPK+INcDIqZFE=; b=T4UPDiDuGGgdqHeoYACU3bWHmlna7nYla37ru2Nf+x9kjooxKWvyfb7aEVKB6JZGH7 mypTBvgzdhohOSfzIE5ZOuCuuQs19L7fGqLk3J1ngWi9mHSCfQFj4AA3rFeBRc/XdulB hZgSLF0H6qJ+NMeTujzAjlbuvRDw4OjqpS4m0DkHFHJePpcQtGz9awR3akUGk/iVJCjO r43EPNrUXsdJkXD8RZowioHVjtd98Su14H8C6prvy0yHB/il+d5k9pqWxTv+cr592CpT ZjNss+TnjrTJn+CoSmYz8IwE2yKSbhod+ejOh5pWVg8nOOix4AoW05gV5cGBxNQ0ZtSZ S+4w== X-Gm-Message-State: AIVw110A9xhrv9cQDVXBAUOP+7/v7fkq4fI6q766EpS3OdWcdbZ7IBKk zyWlwFUHJLkyTmdp X-Received: by 10.99.96.197 with SMTP id u188mr2943413pgb.340.1501132506033; Wed, 26 Jul 2017 22:15:06 -0700 (PDT) Received: from baolinwangubtpc.spreadtrum.com ([117.18.48.82]) by smtp.gmail.com with ESMTPSA id n80sm35177443pfj.118.2017.07.26.22.15.01 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 26 Jul 2017 22:15:05 -0700 (PDT) From: Baolin Wang To: balbi@kernel.org, gregkh@linuxfoundation.org, sre@kernel.org, lee.jones@linaro.org, robh+dt@kernel.org, mark.rutland@arm.com Cc: jun.li@nxp.com, peter.chen@freescale.com, broonie@kernel.org, john.stultz@linaro.org, neilb@suse.com, patches@opensource.wolfsonmicro.com, baolin.wang@linaro.org, linux-pm@vger.kernel.org, linux-usb@vger.kernel.org, device-mainlining@lists.linuxfoundation.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v4 1/3] include: uapi: usb: Introduce USB charger type and state definition Date: Thu, 27 Jul 2017 13:14:36 +0800 Message-Id: <67d041fc5b387696874186f36231b8d696aec6ee.1501132173.git.baolin.wang@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Introducing USB charger type and state definition can help to support USB charging which will be added in USB phy core. Signed-off-by: Baolin Wang --- include/uapi/linux/usb/charger.h | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 include/uapi/linux/usb/charger.h -- 1.7.9.5 diff --git a/include/uapi/linux/usb/charger.h b/include/uapi/linux/usb/charger.h new file mode 100644 index 0000000..5f72af3 --- /dev/null +++ b/include/uapi/linux/usb/charger.h @@ -0,0 +1,31 @@ +/* + * This file defines the USB charger type and state that are needed for + * USB device APIs. + */ + +#ifndef _UAPI__LINUX_USB_CHARGER_H +#define _UAPI__LINUX_USB_CHARGER_H + +/* + * USB charger type: + * SDP (Standard Downstream Port) + * DCP (Dedicated Charging Port) + * CDP (Charging Downstream Port) + * ACA (Accessory Charger Adapters) + */ +enum usb_charger_type { + UNKNOWN_TYPE, + SDP_TYPE, + DCP_TYPE, + CDP_TYPE, + ACA_TYPE, +}; + +/* USB charger state */ +enum usb_charger_state { + USB_CHARGER_DEFAULT, + USB_CHARGER_PRESENT, + USB_CHARGER_ABSENT, +}; + +#endif /* _UAPI__LINUX_USB_CHARGER_H */ From patchwork Thu Jul 27 05:14:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "\(Exiting\) Baolin Wang" X-Patchwork-Id: 108808 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp1624366qge; Wed, 26 Jul 2017 22:15:19 -0700 (PDT) X-Received: by 10.84.173.4 with SMTP id o4mr3317381plb.180.1501132519160; Wed, 26 Jul 2017 22:15:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501132519; cv=none; d=google.com; s=arc-20160816; b=l3I58ahJcWZ6tkKPo0PBnk72YQNL2hMwXJSvpkQqw7cU5wAWk/L1aKytnxgSW37mrh Z5DiPNOqcgWtzEOvL02zok8o7RPwPSqsWujIpaank3yvSG76faxAUcxv3sFBhujYGoJJ imDgt6UjX2Rb7jQNbxs5TnrKvf0WVqWClH9bkYA0TEm+pxi+AsjcA/S9dHKbTFdQqe8D 8AfHjnmbjjYrGv+Va2MjXW4bvPhxsRBsL3ayVWDsvTlnocCzdVFRXnNwVKdz+ZeTFlBS 7S2k8LNDU1Cc+SWu5ex7J7No5aY2R5eJ4sCCfuplT7vAloRO3TNLXDs05R5ZPXKm4yGY CIpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=bzvSJIkFXQzfrVKXov2B/iWxnKGcx2Ne+FaRgashTk8=; b=NDeF+8RCyTdZB171nIhiAZt26KCjt5TxUeJCI2n2rcCIadiszo01u/cQeLGd7rq0YK HdmTgCHzRl63eiSux4XaZpAzKiTtWVaQwbQ8dDOcdbAjyPoXYEDn/HP4pUuWdMfZaDQb z2VVZ3LLSoSUMG5rImyOvFFxrx4PqdpVxNlXJ/yTSXJUy5q6btuy+ALfm+qvSvoLu/1W DybB7At/qSjt9OG6gVAagvMootHU3Uja+hDQiz5+fMuRkSzojvthWQ5ht5c8OArKuu3D ruhhtRiNc6+9DBhVU9Lu/F/4Rim8BWS6C75uW/AR3jIsaufc5T9JejOjX5PXW3WNFkuO xZZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=XADxLmUy; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b4si10475736pfl.145.2017.07.26.22.15.18; Wed, 26 Jul 2017 22:15:19 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.b=XADxLmUy; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751792AbdG0FPQ (ORCPT + 26 others); Thu, 27 Jul 2017 01:15:16 -0400 Received: from mail-pg0-f49.google.com ([74.125.83.49]:37299 "EHLO mail-pg0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751775AbdG0FPM (ORCPT ); Thu, 27 Jul 2017 01:15:12 -0400 Received: by mail-pg0-f49.google.com with SMTP id y129so93089515pgy.4 for ; Wed, 26 Jul 2017 22:15:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=bzvSJIkFXQzfrVKXov2B/iWxnKGcx2Ne+FaRgashTk8=; b=XADxLmUySPpmXuCQUKPW8gAlNYhCUhqkriZ0P85R8WRgvWDRO5Q/1z7kYQ7MY3AU1k mS/gpPRfKp+Y271r4sNCcz7tTWzKaDkvchZcQzqTxKYSptkRQ2W5rF2FuRk42eLqDDLG qeWuWjgjNLNBY+b9SxuoDx29OaFOE4v9Orx5c= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=bzvSJIkFXQzfrVKXov2B/iWxnKGcx2Ne+FaRgashTk8=; b=XiJfpYl/Upj8XEcLg1oT5TqXK7Jnps2upFvOs7R/orPhoNqTjukg7uoheaBXfZMnfk EVHU8EL4+1FFyfQwNTJ2S4jD0gtfqVp2bfCxZ17IDbPCOTKnQFYYFLgFc+xQAUL1QhQH RFLB62vI1WfRB2HfFBPGQ6u3+/PTMMQL93g+boQIPt4ZaNpDdqvbDODjm5O0n6pzENcV t28VSHpBOkviXjsXf+M+CiRDNv43a7EQyXcrgmwrcY8A27P7BHd7vonUawlCievfVDrJ 6K/EBx1pq5xGqSLbmVvUs+qrVhiyrlk+HgkNawRWCROBav8PnYpkYsVu3OOM/rbwLzdC oT9w== X-Gm-Message-State: AIVw112fj5euKHkjNOha8Y7u1FtGzj+Q2U/md/AWmG77MxJ0Nla8MmJJ nhm1HbwO8yqT6AVE X-Received: by 10.98.40.7 with SMTP id o7mr2937950pfo.124.1501132511302; Wed, 26 Jul 2017 22:15:11 -0700 (PDT) Received: from baolinwangubtpc.spreadtrum.com ([117.18.48.82]) by smtp.gmail.com with ESMTPSA id n80sm35177443pfj.118.2017.07.26.22.15.06 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 26 Jul 2017 22:15:10 -0700 (PDT) From: Baolin Wang To: balbi@kernel.org, gregkh@linuxfoundation.org, sre@kernel.org, lee.jones@linaro.org, robh+dt@kernel.org, mark.rutland@arm.com Cc: jun.li@nxp.com, peter.chen@freescale.com, broonie@kernel.org, john.stultz@linaro.org, neilb@suse.com, patches@opensource.wolfsonmicro.com, baolin.wang@linaro.org, linux-pm@vger.kernel.org, linux-usb@vger.kernel.org, device-mainlining@lists.linuxfoundation.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v4 2/3] usb: phy: Add USB charger support Date: Thu, 27 Jul 2017 13:14:37 +0800 Message-Id: <0bfc4d3534a7cc735ef213da8d280a4a79629c0d.1501132173.git.baolin.wang@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch introduces the usb charger support based on usb phy that makes an enhancement to a power driver. The basic conception of the usb charger is that, when one usb charger is added or removed by reporting from the extcon device state change, the usb charger will report to power user to set the current limitation. Power user can register a notifiee on the usb phy by issuing usb_register_notifier() to get notified by charger status changes or charger current changes. we can notify what current to be drawn to power user according to different charger type, and now we have 2 methods to get charger type. One is get charger type from extcon subsystem, which also means the charger state changes. Another is we can get the charger type from USB controller detecting or PMIC detecting, and the charger state changes should be told by issuing usb_phy_set_charger_state(). Signed-off-by: Baolin Wang --- drivers/usb/phy/phy.c | 272 +++++++++++++++++++++++++++++++++++++++++++++++ include/linux/usb/phy.h | 49 +++++++++ 2 files changed, 321 insertions(+) -- 1.7.9.5 diff --git a/drivers/usb/phy/phy.c b/drivers/usb/phy/phy.c index 032f5af..2dc48bb 100644 --- a/drivers/usb/phy/phy.c +++ b/drivers/usb/phy/phy.c @@ -18,6 +18,18 @@ #include +/* Default current range by charger type. */ +#define DEFAULT_SDP_CUR_MIN 2 +#define DEFAULT_SDP_CUR_MAX 500 +#define DEFAULT_SDP_CUR_MIN_SS 150 +#define DEFAULT_SDP_CUR_MAX_SS 900 +#define DEFAULT_DCP_CUR_MIN 500 +#define DEFAULT_DCP_CUR_MAX 5000 +#define DEFAULT_CDP_CUR_MIN 1500 +#define DEFAULT_CDP_CUR_MAX 5000 +#define DEFAULT_ACA_CUR_MIN 1500 +#define DEFAULT_ACA_CUR_MAX 5000 + static LIST_HEAD(phy_list); static LIST_HEAD(phy_bind_list); static DEFINE_SPINLOCK(phy_lock); @@ -77,6 +89,221 @@ static struct usb_phy *__of_usb_find_phy(struct device_node *node) return ERR_PTR(-EPROBE_DEFER); } +static void usb_phy_set_default_current(struct usb_phy *usb_phy) +{ + usb_phy->chg_cur.sdp_min = DEFAULT_SDP_CUR_MIN; + usb_phy->chg_cur.sdp_max = DEFAULT_SDP_CUR_MAX; + usb_phy->chg_cur.dcp_min = DEFAULT_DCP_CUR_MIN; + usb_phy->chg_cur.dcp_max = DEFAULT_DCP_CUR_MAX; + usb_phy->chg_cur.cdp_min = DEFAULT_CDP_CUR_MIN; + usb_phy->chg_cur.cdp_max = DEFAULT_CDP_CUR_MAX; + usb_phy->chg_cur.aca_min = DEFAULT_ACA_CUR_MIN; + usb_phy->chg_cur.aca_max = DEFAULT_ACA_CUR_MAX; +} + +/** + * usb_phy_notify_charger_work - notify the USB charger state + * @work - the charger work to notify the USB charger state + * + * This work can be issued when USB charger state has been changed or + * USB charger current has been changed, then we can notify the current + * what can be drawn to power user and the charger state to userspace. + * + * If we get the charger type from extcon subsystem, we can notify the + * charger state to power user automatically by usb_phy_get_charger_type() + * issuing from extcon subsystem. + * + * If we get the charger type from ->charger_detect() instead of extcon + * subsystem, the usb phy driver should issue usb_phy_set_charger_state() + * to set charger state when the charger state has been changed. + */ +static void usb_phy_notify_charger_work(struct work_struct *work) +{ + struct usb_phy *usb_phy = container_of(work, struct usb_phy, chg_work); + char uchger_state[50] = { 0 }; + char *envp[] = { uchger_state, NULL }; + unsigned int min, max; + + switch (usb_phy->chg_state) { + case USB_CHARGER_PRESENT: + usb_phy_get_charger_current(usb_phy, &min, &max); + + atomic_notifier_call_chain(&usb_phy->notifier, max, usb_phy); + snprintf(uchger_state, ARRAY_SIZE(uchger_state), + "USB_CHARGER_STATE=%s", "USB_CHARGER_PRESENT"); + break; + case USB_CHARGER_ABSENT: + usb_phy_set_default_current(usb_phy); + + atomic_notifier_call_chain(&usb_phy->notifier, 0, usb_phy); + snprintf(uchger_state, ARRAY_SIZE(uchger_state), + "USB_CHARGER_STATE=%s", "USB_CHARGER_ABSENT"); + break; + default: + dev_warn(usb_phy->dev, "Unknown USB charger state: %d\n", + usb_phy->chg_state); + return; + } + + kobject_uevent_env(&usb_phy->dev->kobj, KOBJ_CHANGE, envp); +} + +static void __usb_phy_get_charger_type(struct usb_phy *usb_phy) +{ + if (extcon_get_state(usb_phy->edev, EXTCON_CHG_USB_SDP) > 0) { + usb_phy->chg_type = SDP_TYPE; + usb_phy->chg_state = USB_CHARGER_PRESENT; + } else if (extcon_get_state(usb_phy->edev, EXTCON_CHG_USB_CDP) > 0) { + usb_phy->chg_type = CDP_TYPE; + usb_phy->chg_state = USB_CHARGER_PRESENT; + } else if (extcon_get_state(usb_phy->edev, EXTCON_CHG_USB_DCP) > 0) { + usb_phy->chg_type = DCP_TYPE; + usb_phy->chg_state = USB_CHARGER_PRESENT; + } else if (extcon_get_state(usb_phy->edev, EXTCON_CHG_USB_ACA) > 0) { + usb_phy->chg_type = ACA_TYPE; + usb_phy->chg_state = USB_CHARGER_PRESENT; + } else { + usb_phy->chg_type = UNKNOWN_TYPE; + usb_phy->chg_state = USB_CHARGER_ABSENT; + } + + schedule_work(&usb_phy->chg_work); +} + +/** + * usb_phy_get_charger_type - get charger type from extcon subsystem + * @nb -the notifier block to determine charger type + * @state - the cable state + * @data - private data + * + * Determin the charger type from extcon subsystem which also means the + * charger state has been chaned, then we should notify this event. + */ +static int usb_phy_get_charger_type(struct notifier_block *nb, + unsigned long state, void *data) +{ + struct usb_phy *usb_phy = container_of(nb, struct usb_phy, type_nb); + + __usb_phy_get_charger_type(usb_phy); + return NOTIFY_OK; +} + +/** + * usb_phy_set_charger_current - set the USB charger current + * @usb_phy - the USB phy to be used + * @mA - the current need to be set + * + * Usually we only change the charger default current when USB finished the + * enumeration as one SDP charger. As one SDP charger, usb_phy_set_power() + * will issue this function to change charger current when after setting USB + * configuration, or suspend/resume USB. For other type charger, we should + * use the default charger current and we do not suggest to issue this function + * to change the charger current. + * + * When USB charger current has been changed, we need to notify the power users. + */ +void usb_phy_set_charger_current(struct usb_phy *usb_phy, unsigned int mA) +{ + switch (usb_phy->chg_type) { + case SDP_TYPE: + if (usb_phy->chg_cur.sdp_max == mA) + return; + + usb_phy->chg_cur.sdp_max = (mA > DEFAULT_SDP_CUR_MAX_SS) ? + DEFAULT_SDP_CUR_MAX_SS : mA; + break; + case DCP_TYPE: + if (usb_phy->chg_cur.dcp_max == mA) + return; + + usb_phy->chg_cur.dcp_max = (mA > DEFAULT_DCP_CUR_MAX) ? + DEFAULT_DCP_CUR_MAX : mA; + break; + case CDP_TYPE: + if (usb_phy->chg_cur.cdp_max == mA) + return; + + usb_phy->chg_cur.cdp_max = (mA > DEFAULT_CDP_CUR_MAX) ? + DEFAULT_CDP_CUR_MAX : mA; + break; + case ACA_TYPE: + if (usb_phy->chg_cur.aca_max == mA) + return; + + usb_phy->chg_cur.aca_max = (mA > DEFAULT_ACA_CUR_MAX) ? + DEFAULT_ACA_CUR_MAX : mA; + break; + default: + return; + } + + schedule_work(&usb_phy->chg_work); +} +EXPORT_SYMBOL_GPL(usb_phy_set_charger_current); + +/** + * usb_phy_get_charger_current - get the USB charger current + * @usb_phy - the USB phy to be used + * @min - the minimum current + * @max - the maximum current + * + * Usually we will notify the maximum current to power user, but for some + * special case, power user also need the minimum current value. Then the + * power user can issue this function to get the suitable current. + */ +void usb_phy_get_charger_current(struct usb_phy *usb_phy, + unsigned int *min, unsigned int *max) +{ + switch (usb_phy->chg_type) { + case SDP_TYPE: + *min = usb_phy->chg_cur.sdp_min; + *max = usb_phy->chg_cur.sdp_max; + break; + case DCP_TYPE: + *min = usb_phy->chg_cur.dcp_min; + *max = usb_phy->chg_cur.dcp_max; + break; + case CDP_TYPE: + *min = usb_phy->chg_cur.cdp_min; + *max = usb_phy->chg_cur.cdp_max; + break; + case ACA_TYPE: + *min = usb_phy->chg_cur.aca_min; + *max = usb_phy->chg_cur.aca_max; + break; + default: + *min = 0; + *max = 0; + break; + } +} +EXPORT_SYMBOL_GPL(usb_phy_get_charger_current); + +/** + * usb_phy_set_charger_state - set the USB charger state + * @usb_phy - the USB phy to be used + * @state - the new state need to be set for charger + * + * The usb phy driver can issue this function when the usb phy driver + * detected the charger state has been changed, in this case the charger + * type should be get from ->charger_detect(). + */ +void usb_phy_set_charger_state(struct usb_phy *usb_phy, + enum usb_charger_state state) +{ + if (usb_phy->chg_state == state || !usb_phy->charger_detect) + return; + + usb_phy->chg_state = state; + if (usb_phy->chg_state == USB_CHARGER_PRESENT) + usb_phy->chg_type = usb_phy->charger_detect(usb_phy); + else + usb_phy->chg_type = UNKNOWN_TYPE; + + schedule_work(&usb_phy->chg_work); +} +EXPORT_SYMBOL_GPL(usb_phy_set_charger_state); + static void devm_usb_phy_release(struct device *dev, void *res) { struct usb_phy *phy = *(struct usb_phy **)res; @@ -124,6 +351,44 @@ static int usb_add_extcon(struct usb_phy *x) "register VBUS notifier failed\n"); return ret; } + } else { + x->type_nb.notifier_call = usb_phy_get_charger_type; + + ret = devm_extcon_register_notifier(x->dev, x->edev, + EXTCON_CHG_USB_SDP, + &x->type_nb); + if (ret) { + dev_err(x->dev, + "register extcon USB SDP failed.\n"); + return ret; + } + + ret = devm_extcon_register_notifier(x->dev, x->edev, + EXTCON_CHG_USB_CDP, + &x->type_nb); + if (ret) { + dev_err(x->dev, + "register extcon USB CDP failed.\n"); + return ret; + } + + ret = devm_extcon_register_notifier(x->dev, x->edev, + EXTCON_CHG_USB_DCP, + &x->type_nb); + if (ret) { + dev_err(x->dev, + "register extcon USB DCP failed.\n"); + return ret; + } + + ret = devm_extcon_register_notifier(x->dev, x->edev, + EXTCON_CHG_USB_ACA, + &x->type_nb); + if (ret) { + dev_err(x->dev, + "register extcon USB ACA failed.\n"); + return ret; + } } if (x->id_nb.notifier_call) { @@ -145,6 +410,13 @@ static int usb_add_extcon(struct usb_phy *x) } } + usb_phy_set_default_current(x); + INIT_WORK(&x->chg_work, usb_phy_notify_charger_work); + x->chg_type = UNKNOWN_TYPE; + x->chg_state = USB_CHARGER_DEFAULT; + if (x->type_nb.notifier_call) + __usb_phy_get_charger_type(x); + return 0; } diff --git a/include/linux/usb/phy.h b/include/linux/usb/phy.h index 2992451..de881b1 100644 --- a/include/linux/usb/phy.h +++ b/include/linux/usb/phy.h @@ -12,6 +12,7 @@ #include #include #include +#include enum usb_phy_interface { USBPHY_INTERFACE_MODE_UNKNOWN, @@ -72,6 +73,17 @@ struct usb_phy_io_ops { int (*write)(struct usb_phy *x, u32 val, u32 reg); }; +struct usb_charger_current { + unsigned int sdp_min; + unsigned int sdp_max; + unsigned int dcp_min; + unsigned int dcp_max; + unsigned int cdp_min; + unsigned int cdp_max; + unsigned int aca_min; + unsigned int aca_max; +}; + struct usb_phy { struct device *dev; const char *label; @@ -91,6 +103,13 @@ struct usb_phy { struct extcon_dev *id_edev; struct notifier_block vbus_nb; struct notifier_block id_nb; + struct notifier_block type_nb; + + /* Support USB charger */ + enum usb_charger_type chg_type; + enum usb_charger_state chg_state; + struct usb_charger_current chg_cur; + struct work_struct chg_work; /* for notification of usb_phy_events */ struct atomic_notifier_head notifier; @@ -129,6 +148,12 @@ struct usb_phy { enum usb_device_speed speed); int (*notify_disconnect)(struct usb_phy *x, enum usb_device_speed speed); + + /* + * Charger detection method can be implemented if you need to + * manually detect the charger type. + */ + enum usb_charger_type (*charger_detect)(struct usb_phy *x); }; /** @@ -219,6 +244,12 @@ extern struct usb_phy *devm_usb_get_phy_by_node(struct device *dev, extern int usb_bind_phy(const char *dev_name, u8 index, const char *phy_dev_name); extern void usb_phy_set_event(struct usb_phy *x, unsigned long event); +extern void usb_phy_set_charger_current(struct usb_phy *usb_phy, + unsigned int mA); +extern void usb_phy_get_charger_current(struct usb_phy *usb_phy, + unsigned int *min, unsigned int *max); +extern void usb_phy_set_charger_state(struct usb_phy *usb_phy, + enum usb_charger_state state); #else static inline struct usb_phy *usb_get_phy(enum usb_phy_type type) { @@ -270,11 +301,29 @@ static inline int usb_bind_phy(const char *dev_name, u8 index, static inline void usb_phy_set_event(struct usb_phy *x, unsigned long event) { } + +static inline void usb_phy_set_charger_current(struct usb_phy *usb_phy, + unsigned int mA) +{ +} + +static inline void usb_phy_get_charger_current(struct usb_phy *usb_phy, + unsigned int *min, + unsigned int *max) +{ +} + +static inline void usb_phy_set_charger_state(struct usb_phy *usb_phy, + enum usb_charger_state state) +{ +} #endif static inline int usb_phy_set_power(struct usb_phy *x, unsigned mA) { + usb_phy_set_charger_current(x, mA); + if (x && x->set_power) return x->set_power(x, mA); return 0; From patchwork Thu Jul 27 05:14:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "\(Exiting\) Baolin Wang" X-Patchwork-Id: 108809 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp1624461qge; Wed, 26 Jul 2017 22:15:26 -0700 (PDT) X-Received: by 10.99.126.86 with SMTP id o22mr2947292pgn.381.1501132526722; Wed, 26 Jul 2017 22:15:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501132526; cv=none; d=google.com; s=arc-20160816; b=nZzmfnAKWFwy9Ga11xbJqok23b6nG5eqXsylsqssegOvo8mZ2u3LITwMBCflQ6YE9m bLuxhd41FeFHKLLeuDVdnleWCf8X4bJmUtBLTalsHXGRk10Wwbr7+Y4B7NJ68QHP84Js FqyjBFd8m/BauRZk76eEZiiHKVsVQpnWN1qtb3gctzwjDxOmjrAygPgKgo4p3yUDQhwG pvWuvP9WWeoqQWquk3pctQ9udTkkSmyTevoGu/4BK3ky+mZkerm26OY4cn3nxLK/GAim cKqGYzmVbxWdxwqB7pfhpSMt8t1xK8xtZxaoL8/8SQFGVKb3ife9LK3ZguouGh75s5KK x5Ww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=y+B07hCUYbm2kDVoRPRDgyYOkfJHnTzNNXFmfbGU8us=; b=nhKY23kvE/aRcGTAuPhd4ScrGTmtuSVbOChHS0FeiIIjOqrXXulkQhOr+s52IMRX2v xNe5P4UHs9ZscGcKRzeGUSdme84lHy4W7jKhD3S36pSM6ouw9G/NnG/EWvUl8OirKuCU LW0bV5ejTCHnmSvXZxK8CpVutvRJEx227dz0DZ6PfRoLyH87Ck88y2aEeic0SVlz+Fzy 6+G79YEea+nzsvZqHr9PmQNvnDhTG4+VV1TuDznBIsRFub34eioLEunOfLeypMNtfuTE Oc1bRO2ZulNqAbNA7h+CbxuhPhKzsJsSoKqC/ISAkLnz8kURZNApeyWKmgyGYP9oPSh0 LjBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=IvAut1MV; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t5si9376099plm.918.2017.07.26.22.15.26; Wed, 26 Jul 2017 22:15:26 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.b=IvAut1MV; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751826AbdG0FPX (ORCPT + 26 others); Thu, 27 Jul 2017 01:15:23 -0400 Received: from mail-pg0-f52.google.com ([74.125.83.52]:37317 "EHLO mail-pg0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751796AbdG0FPR (ORCPT ); Thu, 27 Jul 2017 01:15:17 -0400 Received: by mail-pg0-f52.google.com with SMTP id y129so93090461pgy.4 for ; Wed, 26 Jul 2017 22:15:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=y+B07hCUYbm2kDVoRPRDgyYOkfJHnTzNNXFmfbGU8us=; b=IvAut1MVw6acWvxFeGsDNGlqS6HAe2tAVut48pCTS46OdYYm6ceopiCWdSBcNThlKv LrQlkZLMMVLGQcziZAEdXYylTtmfTISVDn8akzRt0u3TOkZ7BThC655jqpETpdxAjUEu 5O2s0SveJUz2BGERT80Pk4Gfzie0h8pLcKY5I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=y+B07hCUYbm2kDVoRPRDgyYOkfJHnTzNNXFmfbGU8us=; b=R3hyOGy9wYR+WDICRZkp9KGuDiAqtCdZMo8+CZ2KPF43brUi1ofATHyfclrCMJzQ1S d+4fyhCbjUduDpglB9lzKdqCgvoe/bSND3TOBmtzzZXosbM3QuMWSjOMgufXQDwluicu W4p19wsWzEFN8ZXFZvP8MtcKtppUdudagx/DH4ILrCzxvLVDuY0jS0HZRIY+cBTKChk+ PXtJAokbOrOLfXV9VWTEIY+rN0bxxmEk5JTRxlo+Qe4mkXcZvD9ImZb1J0PzgOg/L5zb o0cEK8L1YnWX4g5+endIGzMddO9DZpK+EtEPQVpUuAeg5BMeT6BLss/pzuxK3frPlrIN kVKQ== X-Gm-Message-State: AIVw113cHrjLAzDe2OAdIbi86Kdl7BgFc+uWQ1ZWmhUk33GI7qBvGYiw L49NaGh/FCXUabS3 X-Received: by 10.99.0.209 with SMTP id 200mr2979651pga.138.1501132516830; Wed, 26 Jul 2017 22:15:16 -0700 (PDT) Received: from baolinwangubtpc.spreadtrum.com ([117.18.48.82]) by smtp.gmail.com with ESMTPSA id n80sm35177443pfj.118.2017.07.26.22.15.11 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 26 Jul 2017 22:15:16 -0700 (PDT) From: Baolin Wang To: balbi@kernel.org, gregkh@linuxfoundation.org, sre@kernel.org, lee.jones@linaro.org, robh+dt@kernel.org, mark.rutland@arm.com Cc: jun.li@nxp.com, peter.chen@freescale.com, broonie@kernel.org, john.stultz@linaro.org, neilb@suse.com, patches@opensource.wolfsonmicro.com, baolin.wang@linaro.org, linux-pm@vger.kernel.org, linux-usb@vger.kernel.org, device-mainlining@lists.linuxfoundation.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v4 3/3] power: wm831x_power: Support USB charger current limit management Date: Thu, 27 Jul 2017 13:14:38 +0800 Message-Id: X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Integrate with the newly added USB charger interface to limit the current we draw from the USB input based on the input device configuration identified by the USB stack, allowing us to charge more quickly from high current inputs without drawing more current than specified from others. Signed-off-by: Mark Brown Signed-off-by: Baolin Wang Acked-by: Lee Jones Acked-by: Charles Keepax --- Documentation/devicetree/bindings/mfd/wm831x.txt | 1 + drivers/power/supply/wm831x_power.c | 72 ++++++++++++++++++++++ 2 files changed, 73 insertions(+) -- 1.7.9.5 diff --git a/Documentation/devicetree/bindings/mfd/wm831x.txt b/Documentation/devicetree/bindings/mfd/wm831x.txt index 9f8b743..4e3bc07 100644 --- a/Documentation/devicetree/bindings/mfd/wm831x.txt +++ b/Documentation/devicetree/bindings/mfd/wm831x.txt @@ -31,6 +31,7 @@ Required properties: ../interrupt-controller/interrupts.txt Optional sub-nodes: + - usb-phy : Contains a phandle to the USB PHY. - regulators : Contains sub-nodes for each of the regulators supplied by the device. The regulators are bound using their names listed below: diff --git a/drivers/power/supply/wm831x_power.c b/drivers/power/supply/wm831x_power.c index 7082301..dff6473 100644 --- a/drivers/power/supply/wm831x_power.c +++ b/drivers/power/supply/wm831x_power.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include @@ -31,6 +32,8 @@ struct wm831x_power { char usb_name[20]; char battery_name[20]; bool have_battery; + struct usb_phy *usb_phy; + struct notifier_block usb_notify; }; static int wm831x_power_check_online(struct wm831x *wm831x, int supply, @@ -125,6 +128,43 @@ static int wm831x_usb_get_prop(struct power_supply *psy, POWER_SUPPLY_PROP_VOLTAGE_NOW, }; +/* In milliamps */ +static const unsigned int wm831x_usb_limits[] = { + 0, + 2, + 100, + 500, + 900, + 1500, + 1800, + 550, +}; + +static int wm831x_usb_limit_change(struct notifier_block *nb, + unsigned long limit, void *data) +{ + struct wm831x_power *wm831x_power = container_of(nb, + struct wm831x_power, + usb_notify); + unsigned int i, best; + + /* Find the highest supported limit */ + best = 0; + for (i = 0; i < ARRAY_SIZE(wm831x_usb_limits); i++) { + if (limit >= wm831x_usb_limits[i] && + wm831x_usb_limits[best] < wm831x_usb_limits[i]) + best = i; + } + + dev_dbg(wm831x_power->wm831x->dev, + "Limiting USB current to %umA", wm831x_usb_limits[best]); + + wm831x_set_bits(wm831x_power->wm831x, WM831X_POWER_STATE, + WM831X_USB_ILIM_MASK, best); + + return 0; +} + /********************************************************************* * Battery properties *********************************************************************/ @@ -607,6 +647,33 @@ static int wm831x_power_probe(struct platform_device *pdev) } } + power->usb_phy = devm_usb_get_phy_by_phandle(&pdev->dev, "usb-phy", 0); + ret = PTR_ERR_OR_ZERO(power->usb_phy); + + switch (ret) { + case 0: + power->usb_notify.notifier_call = wm831x_usb_limit_change; + ret = usb_register_notifier(power->usb_phy, &power->usb_notify); + if (ret) { + dev_err(&pdev->dev, "Failed to register notifier: %d\n", + ret); + goto err_bat_irq; + } + break; + case -EINVAL: + case -ENODEV: + /* ignore missing usb-phy, it's optional */ + power->usb_phy = NULL; + ret = 0; + break; + default: + dev_err(&pdev->dev, "Failed to find USB phy: %d\n", ret); + /* fall-through */ + case -EPROBE_DEFER: + goto err_bat_irq; + break; + } + return ret; err_bat_irq: @@ -637,6 +704,11 @@ static int wm831x_power_remove(struct platform_device *pdev) struct wm831x *wm831x = wm831x_power->wm831x; int irq, i; + if (wm831x_power->usb_phy) { + usb_unregister_notifier(wm831x_power->usb_phy, + &wm831x_power->usb_notify); + } + for (i = 0; i < ARRAY_SIZE(wm831x_bat_irqs); i++) { irq = wm831x_irq(wm831x, platform_get_irq_byname(pdev,