From patchwork Tue Dec 8 08:36:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "\(Exiting\) Baolin Wang" X-Patchwork-Id: 57836 Delivered-To: patch@linaro.org Received: by 10.112.147.194 with SMTP id tm2csp1655366lbb; Tue, 8 Dec 2015 00:37:04 -0800 (PST) X-Received: by 10.66.62.137 with SMTP id y9mr441962par.123.1449563823449; Tue, 08 Dec 2015 00:37:03 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id gw4si3723154pac.129.2015.12.08.00.37.03; Tue, 08 Dec 2015 00:37:03 -0800 (PST) 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; 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; dkim=neutral (body hash did not verify) header.i=@linaro-org.20150623.gappssmtp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964929AbbLHIg4 (ORCPT + 28 others); Tue, 8 Dec 2015 03:36:56 -0500 Received: from mail-pf0-f169.google.com ([209.85.192.169]:34710 "EHLO mail-pf0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964848AbbLHIgw (ORCPT ); Tue, 8 Dec 2015 03:36:52 -0500 Received: by pfbg73 with SMTP id g73so9005044pfb.1 for ; Tue, 08 Dec 2015 00:36:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=6Xoni5NSznszwh+7AuHSzyD4lbA1eq5FR66POageHig=; b=t/fyU1pbTvOAnj5mLGPiHD/jAO7XSP5Xo1sVE4whZt92VXPJiQbyufB1PVVd7RF6ss 3uneLcemV6qW/y5/+RgsIXhf5TocDJxOIV3ubUygGqjfWNh4mOhZzGePT/yDgzEfA2nU 2ljzbfwS8GxpLZ/7uQ78pn6loDyHqvhar2Qj51I/0Y5upzR8fwrPY9jT27QwsX4iYG9y KgaWQTWMVyZgdINo8bqZpaZme5bwYVTDq7LN579dKLRePQbfvOz4cI3enk8sgzhVBYIS irwHxAzZVRqVZdpCEvhQuevWHLFVG/TnPlNjdd/y2fGCIWDkZUtGJk8GUxy2Gd+y14uP bvQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=6Xoni5NSznszwh+7AuHSzyD4lbA1eq5FR66POageHig=; b=dviO/uFGQan2yym7U+mjYr4MSCxeUgujxXjp9iGI6rT7Rzf+titkhvk0IC44ilxEhv F7kYvVDZuaIZjRPZ0tx85/TrN3g9wYcQyzCTveGf/Ntdgq0A1i9W1wX8hKACnkQRvf4T rCtnrhO0jvklA2hKS6U3jdfhN03hd0ZkffudLYX5FXBpGxecgHBIsd7yy+1gqKioSsqc N4dv9GO+RD++aVYQeIKBdfFJoe/JTccSo44kIQkm1uR83OUQgZ3gqTQDcxZVbQoTqui4 902EBDLShCySCtKDJ+Q5IQTZCbzWX8FrFXy9ILW3Cq2KEFw9Agq7r/HSpI+aNkfoiDFq kUjw== X-Gm-Message-State: ALoCoQkWYlJvyqf7qCU22H5+PU7ZtXQFjj6F5L1RoyLVf1eUSmWqohbUw8ztVzhQYHEvSTql1gV6OEiz5u8At8JE5uC/BVDtVQ== X-Received: by 10.98.2.18 with SMTP id 18mr3224835pfc.5.1449563811427; Tue, 08 Dec 2015 00:36:51 -0800 (PST) Received: from baolinwangubtpc.spreadtrum.com ([175.111.195.49]) by smtp.gmail.com with ESMTPSA id fm1sm3049954pab.6.2015.12.08.00.36.47 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 08 Dec 2015 00:36:50 -0800 (PST) From: Baolin Wang To: balbi@ti.com, gregkh@linuxfoundation.org, sre@kernel.org, dbaryshkov@gmail.com, dwmw2@infradead.org Cc: peter.chen@freescale.com, stern@rowland.harvard.edu, r.baldyga@samsung.com, yoshihiro.shimoda.uh@renesas.com, lee.jones@linaro.org, broonie@kernel.org, ckeepax@opensource.wolfsonmicro.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 v7 4/4] power: wm831x_power: Support USB charger current limit management Date: Tue, 8 Dec 2015 16:36:04 +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 Acked-by: Peter Chen Acked-by: Sebastian Reichel --- drivers/power/wm831x_power.c | 69 ++++++++++++++++++++++++++++++++++++++ include/linux/mfd/wm831x/pdata.h | 3 ++ 2 files changed, 72 insertions(+) -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ diff --git a/drivers/power/wm831x_power.c b/drivers/power/wm831x_power.c index 7082301..043f1f4 100644 --- a/drivers/power/wm831x_power.c +++ b/drivers/power/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_charger *usb_charger; + struct notifier_block usb_notify; }; static int wm831x_power_check_online(struct wm831x *wm831x, int supply, @@ -125,6 +128,43 @@ static enum power_supply_property wm831x_usb_props[] = { POWER_SUPPLY_PROP_VOLTAGE_NOW, }; +/* In milliamps */ +static 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); + 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 %dmA", wm831x_usb_limits[best]); + + wm831x_set_bits(wm831x_power->wm831x, WM831X_POWER_STATE, + WM831X_USB_ILIM_MASK, best); + + return 0; +} + /********************************************************************* * Battery properties *********************************************************************/ @@ -607,8 +647,31 @@ static int wm831x_power_probe(struct platform_device *pdev) } } + if (wm831x_pdata && wm831x_pdata->usb_gadget) { + power->usb_charger = + usb_charger_find_by_name(wm831x_pdata->usb_gadget); + if (IS_ERR(power->usb_charger)) { + ret = PTR_ERR(power->usb_charger); + dev_err(&pdev->dev, + "Failed to find USB gadget: %d\n", ret); + goto err_bat_irq; + } + + power->usb_notify.notifier_call = wm831x_usb_limit_change; + + ret = usb_charger_register_notify(power->usb_charger, + &power->usb_notify); + if (ret != 0) { + dev_err(&pdev->dev, + "Failed to register notifier: %d\n", ret); + goto err_usb_charger; + } + } + return ret; +err_usb_charger: + /* put_device on charger */ err_bat_irq: --i; for (; i >= 0; i--) { @@ -637,6 +700,12 @@ static int wm831x_power_remove(struct platform_device *pdev) struct wm831x *wm831x = wm831x_power->wm831x; int irq, i; + if (wm831x_power->usb_charger) { + usb_charger_unregister_notify(wm831x_power->usb_charger, + &wm831x_power->usb_notify); + /* Free charger */ + } + for (i = 0; i < ARRAY_SIZE(wm831x_bat_irqs); i++) { irq = wm831x_irq(wm831x, platform_get_irq_byname(pdev, diff --git a/include/linux/mfd/wm831x/pdata.h b/include/linux/mfd/wm831x/pdata.h index dcc9631..5af8399 100644 --- a/include/linux/mfd/wm831x/pdata.h +++ b/include/linux/mfd/wm831x/pdata.h @@ -126,6 +126,9 @@ struct wm831x_pdata { /** The driver should initiate a power off sequence during shutdown */ bool soft_shutdown; + /** dev_name of USB charger gadget to integrate with */ + const char *usb_gadget; + int irq_base; int gpio_base; int gpio_defaults[WM831X_GPIO_NUM];