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,