From patchwork Tue Jun 27 07:49:33 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: 106402 Delivered-To: patch@linaro.org Received: by 10.140.101.48 with SMTP id t45csp922773qge; Tue, 27 Jun 2017 00:50:03 -0700 (PDT) X-Received: by 10.98.198.208 with SMTP id x77mr4020629pfk.229.1498549803174; Tue, 27 Jun 2017 00:50:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498549803; cv=none; d=google.com; s=arc-20160816; b=XHuisZ4g0j0JaUFboOWjG8l7jHtdnAdYXm9IbNm2g/KlQzYxdz7rz6aBBFb8GgXlYH VoNbHbZQJsk61QyUCN03mvuAE2HveS/+BN2EDKnPdaCG4EL7GVH+X7ssMKyVcpvXSfIC LDrtvBv/N0Dy3PJCI+pY3sjcKTy9HafeJswvCiDMf79JWZsSvjETsk2EfwNjPmbtJ4Qz V+z1z7enVius4OPcXygLyPKDcT6+MopYOvgkTZDX1DU7Awqzi1rtSIGOOCcSb75WzeBE iEcErtqu3FgrY/ONsJlQLxm2smOY3soy2jLCCIRGUHpO9QO4C02ja82C+eijJ3JjhUPS f49Q== 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:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=N9r5VEQXKz5m+Eensbdev1yPt9+TbahPK+INcDIqZFE=; b=D/Lh/UcA1sy4FAkyS13tNWoKb9scOUN8q00w2CghBTeK8ShyW7L8ZQmlWQV1RCGEJE gEQFdNnGGULT2slJFZwWgfGrvcz1hdszukODIJp5E5BLt+G6LacXCtiE+mlsDKB2GpNq N4q72EosBrdZ6kR+OsUx+mUFA/8X3KWcFLsoefsayGyNFwrZbskNtO+cYyDENp31SZo8 QnUjpYGl9si19A5zlVro1tpQykIg/k9+NFGWv6n2yURsfvSFmGm+9+CNdwI7QYDEU46O dAcpHLvTjJARdGSAx+PhyWEudMt0aDAnD8toLqaKC/dUnfDF+FFF8kVAfPA300F464tB TQWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=Xg/XzFqR; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-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 k91si1610712pld.591.2017.06.27.00.50.02; Tue, 27 Jun 2017 00:50:03 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-pm-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=Xg/XzFqR; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-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 S1751819AbdF0HuB (ORCPT + 14 others); Tue, 27 Jun 2017 03:50:01 -0400 Received: from mail-pg0-f43.google.com ([74.125.83.43]:33204 "EHLO mail-pg0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751587AbdF0HuA (ORCPT ); Tue, 27 Jun 2017 03:50:00 -0400 Received: by mail-pg0-f43.google.com with SMTP id f127so11998718pgc.0 for ; Tue, 27 Jun 2017 00:49:59 -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; bh=N9r5VEQXKz5m+Eensbdev1yPt9+TbahPK+INcDIqZFE=; b=Xg/XzFqRD5RweExOTKUzyE5YTpUXZeFYRy73BUrVIbUwxbb4KDYwZUOXpjzrE7ddxG OfSGmNAdjNCCzx1Enq+QZhpmEhUMLa19CweHwbjlaZmB90Ig4na+/e+ZaZtjBMFyDUpe bQ0o+gZCDjKYhHa4UzVh7P4trmSWJMug4OszI= 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; bh=N9r5VEQXKz5m+Eensbdev1yPt9+TbahPK+INcDIqZFE=; b=qMP6H3cveCWosLM8TYNcvotCc9sQIt1nnAu33ZXihgM2snmuFTrjow9fscnJEFVV9g zq5TGakz2PSm98h5IFg/Z+cQaro0uhLD8lGzzTt7jq/FkX4fxHRNQyzsMEyZzj/lxkaa e4NoGBWXBUTp3LpmIURd1XtmaQnvBB35UbAzn5pRR/n/jSUv0PhQJAsxwlNnXkYIC3z7 riWc59jXXl6SR+SOeHLDOEB6Xa4tFEdHZVjJec3YmzSBJ9CEg7j+brkoecNmLf/fE7OI MzwBMpNm6c7AYVKcDjhKy6/3ew4UBIP7o7Rm3t8FSECuVjh3uBJZCueefIA1h4yNV3hx kC5g== X-Gm-Message-State: AKS2vOyGCcJ8fiQYVkm7ia9wGP7zQx+I7bckWt2IZXIivNqVmJnJLU9u 4fdeuO3S8X9Row4O X-Received: by 10.98.61.199 with SMTP id x68mr3943087pfj.228.1498549799363; Tue, 27 Jun 2017 00:49:59 -0700 (PDT) Received: from baolinwangubtpc.spreadtrum.com ([117.18.48.82]) by smtp.gmail.com with ESMTPSA id b85sm4634961pfe.94.2017.06.27.00.49.55 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 27 Jun 2017 00:49:58 -0700 (PDT) From: Baolin Wang To: balbi@kernel.org, gregkh@linuxfoundation.org, sre@kernel.org 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 Subject: [PATCH 1/3] include: uapi: usb: Introduce USB charger type and state definition Date: Tue, 27 Jun 2017 15:49:33 +0800 Message-Id: <54d4a3ae584900a74e04b5cd27157dced44fdfef.1498548022.git.baolin.wang@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@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 Tue Jun 27 07:49:34 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: 106403 Delivered-To: patch@linaro.org Received: by 10.140.101.48 with SMTP id t45csp922872qge; Tue, 27 Jun 2017 00:50:10 -0700 (PDT) X-Received: by 10.98.78.88 with SMTP id c85mr4051315pfb.17.1498549810268; Tue, 27 Jun 2017 00:50:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498549810; cv=none; d=google.com; s=arc-20160816; b=C7CED5SSlyZAfLvT8Kj1bjW0li/+QV8DRzyIYpazwuOxiLxIaE6SyR1ecmj3fCPvXr 5XOUblevQez5ugBeeD1E19I44+pM9ZVrrCuEaO0M70YNdPVu9ETYfN1mCWEh18nhZaAE 7Cp9Q3ijyk4U73BuFeV/KyrVx/q7rtl38sEBqmUvE+clKoLeADc6dOh9nBlM//SLfxZw AAuRbZm+ekzjeIeEVFxUmc+eao4r0O/5wvnJpYDcAlsm3K2bJT00sivHqyPouQvmGk2e w3DaVhWfGnE8qBrFUosTy1vFUngw7chdkGri8RfqVsqQ+188rQub01bPTtT09J1E4tVm gQiQ== 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=ewbbqblX9ajJOmlu7LDk6/ZOe34QW8MMyXHJIwHUwNc=; b=erhgHpATnFe34JuaX8KDZxuiFPkgq/npOkSIa1rnVvgTm1azsgiPKJwEJrcHDog+6h uAvDvic+VJxLg0ax/SW42+bJZ6P/LopMJiYDr0snF9HOwnxNe79GW78a/FyYpzr23VCY aU5VEsPFFA9+ylm54Fe3osRnZ25osF9npm7NZEkdu+wj5+K15xdL6Oxwy9E5FjlcJ/C7 4YeWzTh5/UvsHb1kKgGXh7s++KJv0/Pl4FMOXfmtG3PCBLEy/ZoB2ZwFinP7mAEkov5H M/iPRcJfj/YLVYkSrfhpLZM9OEdrveF3P7M7rJZAU/fhj2VFeHkwuk3pABdx8wdirDL9 T7cw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=IpT9OMCk; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-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 m23si1617615plk.130.2017.06.27.00.50.09; Tue, 27 Jun 2017 00:50:10 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-pm-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=IpT9OMCk; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-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 S1751498AbdF0HuH (ORCPT + 14 others); Tue, 27 Jun 2017 03:50:07 -0400 Received: from mail-pf0-f175.google.com ([209.85.192.175]:32800 "EHLO mail-pf0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752133AbdF0HuE (ORCPT ); Tue, 27 Jun 2017 03:50:04 -0400 Received: by mail-pf0-f175.google.com with SMTP id e7so12617308pfk.0 for ; Tue, 27 Jun 2017 00:50:04 -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=ewbbqblX9ajJOmlu7LDk6/ZOe34QW8MMyXHJIwHUwNc=; b=IpT9OMCkk48K349iWqM2f2wTRRjH0CHhEefAjPSvG4b4C5j2TkButOSngSb8qgvSTu fyaJpjh1EuSEhsAatKRYadCB7Scw89De2uLBE5ngkpbFFM/q5B+6IgE00OmaE+1N7S2d eR23cHM+qlvlAxtgH0/CSWTgKypNS2fI4hr0w= 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=ewbbqblX9ajJOmlu7LDk6/ZOe34QW8MMyXHJIwHUwNc=; b=PbdwzoXrzkjAnfyz8duOCuHM551fisJ3CK4+JPPnUrZNvK9mf4pi5RiZ+f71Enzcld RivLv5lz889SvRktreHZqKCFNRJLyJdYMgahjZ5Jer7apfV2J+flW+gZoSkb6VDZVHmq vrcmDI3+FK4AB1vyPRiaj+cCim7APUDw3Trqr/KJ+voEyMAgMasWNaNJ0gLD0pST12SJ kifVOJ8T2obrZn7Q+KdLnAm7xTdnBYk6DrXmoc/L3KfXnW5pzw7FAZWq0+fRKmY1fITO mhPLwfv4YS36diH40hKQQGyYpNZQ48usA3+7l6z66LmMpV7z4Z/fvvx41bDdWHSTqJyt WaqQ== X-Gm-Message-State: AKS2vOy4rgb0pSi2vfgEzqUgk4nWTnvr6ddvTi4h+W/agVEeaJOnHTkn 3WK6eoO4xtZ3OXcj X-Received: by 10.98.155.148 with SMTP id e20mr4065663pfk.149.1498549803530; Tue, 27 Jun 2017 00:50:03 -0700 (PDT) Received: from baolinwangubtpc.spreadtrum.com ([117.18.48.82]) by smtp.gmail.com with ESMTPSA id b85sm4634961pfe.94.2017.06.27.00.49.59 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 27 Jun 2017 00:50:02 -0700 (PDT) From: Baolin Wang To: balbi@kernel.org, gregkh@linuxfoundation.org, sre@kernel.org 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 Subject: [PATCH 2/3] usb: phy: Add USB charger support Date: Tue, 27 Jun 2017 15:49:34 +0800 Message-Id: X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <54d4a3ae584900a74e04b5cd27157dced44fdfef.1498548022.git.baolin.wang@linaro.org> References: <54d4a3ae584900a74e04b5cd27157dced44fdfef.1498548022.git.baolin.wang@linaro.org> In-Reply-To: References: Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@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 | 265 +++++++++++++++++++++++++++++++++++++++++++++++ include/linux/usb/phy.h | 48 +++++++++ 2 files changed, 313 insertions(+) -- 1.7.9.5 diff --git a/drivers/usb/phy/phy.c b/drivers/usb/phy/phy.c index 032f5af..db72802 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,216 @@ 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); +} + +/** + * 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); + + 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); + 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 +346,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 +405,11 @@ 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; + return 0; } diff --git a/include/linux/usb/phy.h b/include/linux/usb/phy.h index 2992451..bab4445a 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,13 +301,30 @@ 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) { } + +void usb_phy_set_charger_current(struct usb_phy *usb_phy, unsigned int mA) +{ +} + +void usb_phy_get_charger_current(struct usb_phy *usb_phy, + unsigned int *min, unsigned int *max) +{ +} + +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; }