From patchwork Tue Aug 15 11:07:55 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: 110130 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp5523776qge; Tue, 15 Aug 2017 04:08:53 -0700 (PDT) X-Received: by 10.84.169.67 with SMTP id g61mr30848832plb.109.1502795333014; Tue, 15 Aug 2017 04:08:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502795333; cv=none; d=google.com; s=arc-20160816; b=j/d3Xjcv0Dc/DvMQj76g02aRMNZOCIaDgnvfjJfLA+0EjQKP3OK7tn9NEHz548+GsY yz4xY5ZxBAKCFJpKdBY514mik3A/+vNS/NltV8wez7yM96iDFN3+NKxTTNJlYQzRP8G0 o0gdID4++CEYy34B/3B8L386kHr9iAEEENbUUrfYly+vhSzS/JMg6s9GT9hJzVBXMvIh 4ouo2a63NZoukb4eNg6ptJj7mXIP1VPvGX7TVJnDTx2heF82tAvh1LMQYpyLADaryD9k tIAw0YwLfVCd2UvAfbAAuuM9Zwmnt6D5ZrMufi6R5msnYTn2gyRfxZf8of41od063Xlr eLWQ== 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=Yj47cKrg9WUudDFfMU0iVeI1igpWcwLLvI4J846/wxM=; b=fhbdGpG342aYR1zryDjNlgttoYk9+LzsBaZb+JT2TZnLIUK5eHVEKFpuSaPllcei6u ItDQBmLiVD2bV160x+GoxJQSXyHdOu3n8rTuLpntMVo2urwC7if1fMnvZ3FLbMcIDLRi vOsPoAMdQ1UfBRvD9rQLkTGA8pdYNL/a7Z7YOENP6vH2cao2BCm+hqQ/XDKpf4aSNalz gGcdgaWug3njNRRN1AeXRncuVNmtIEDnLBNCRZw6Qp3M92LOzbWE5EUYNK0IzpHL8kH9 hkylzEuSJ7ZnR/sqc3A3qjUK/jqHMFY75sUBr/SgDszNsXHsUf3G1xQxqESxZjlWoSKJ ivLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=j3meEVjy; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (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 k6si6053280pln.803.2017.08.15.04.08.52; Tue, 15 Aug 2017 04:08:53 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=j3meEVjy; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751605AbdHOLIu (ORCPT + 6 others); Tue, 15 Aug 2017 07:08:50 -0400 Received: from mail-pg0-f53.google.com ([74.125.83.53]:35663 "EHLO mail-pg0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751810AbdHOLIr (ORCPT ); Tue, 15 Aug 2017 07:08:47 -0400 Received: by mail-pg0-f53.google.com with SMTP id v189so3995124pgd.2 for ; Tue, 15 Aug 2017 04:08:46 -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=TjpqsptKUSr62UARCd4kADbGE35Vy711cRGVZHv2F6E=; b=j3meEVjya2ng+ubAl9zSW1zO9QWVO1CQQ+N5zFl7Gc3UFMj+ZxCxp159mIvgz4ls6R TdjpAAQ4vNgbQgdDI1G07NLar/Q9ceZEcgvgvmzLl6QH8Pb1aEL/ZmQjNBYERFdxFnV+ xOAQioID80RbPwUpqwO1q+BmPO3RZ4UG/F5Z4= 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=TjpqsptKUSr62UARCd4kADbGE35Vy711cRGVZHv2F6E=; b=oNgX0Q7RD8Z9oUB6PpM4YLWS6Q19ONxeoBpUA66uOXwTW+mXbOvrBRDzlRp8rIiYOa jbzAvvjZjg219kiXWWiKYo4NBc/nw5MB11eEMEHG808i2sFcObrFF1iDWFl6Gu6Wg/ki hCTVPA3MDWQ7t35rgniPMWXSZYBVzlZf9s5k26qwrmFASPbom25HSliMxTsezj3hMfgE /3mN/VdJS4RdzQKNLKvceMURKLWcrvcCKPOLiHabOvjNBp+tGVg5KPu9127syjnQX78I PhmiL+9/mwdzMMRQhbwmxpxm/FPravU6lvcAbfVeOMlvbswFZWdmIyW4NkotKTRkM65v fxyg== X-Gm-Message-State: AHYfb5g6vdtr0G6bP3XOqGv7QwA00tGi4kbe4hGQnm6hk8BouRnl4YUX LebCELn8ct49V7DG X-Received: by 10.98.14.67 with SMTP id w64mr17890169pfi.112.1502795326449; Tue, 15 Aug 2017 04:08:46 -0700 (PDT) Received: from baolinwangubtpc.spreadtrum.com ([117.18.48.82]) by smtp.gmail.com with ESMTPSA id p77sm16705197pfi.153.2017.08.15.04.08.42 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 15 Aug 2017 04:08:45 -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 v5 3/3] power: wm831x_power: Support USB charger current limit management Date: Tue, 15 Aug 2017 19:07:55 +0800 Message-Id: <485f6d343945d0b075602456c9393f8e6c065e91.1502794832.git.baolin.wang@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: In-Reply-To: References: Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@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 Acked-by: Sebastian Reichel --- Documentation/devicetree/bindings/mfd/wm831x.txt | 1 + drivers/power/supply/wm831x_power.c | 72 ++++++++++++++++++++++ 2 files changed, 73 insertions(+) -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Acked-by: Rob Herring diff --git a/Documentation/devicetree/bindings/mfd/wm831x.txt b/Documentation/devicetree/bindings/mfd/wm831x.txt index 9f8b743..5057094 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: + - phys : 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..927050d 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, "phys", 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,