From patchwork Fri Nov 6 11:35:14 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: 56112 Delivered-To: patch@linaro.org Received: by 10.112.61.134 with SMTP id p6csp953252lbr; Fri, 6 Nov 2015 03:36:51 -0800 (PST) X-Received: by 10.66.162.100 with SMTP id xz4mr16946885pab.145.1446809811804; Fri, 06 Nov 2015 03:36:51 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id eg4si15233073pbc.189.2015.11.06.03.36.51; Fri, 06 Nov 2015 03:36:51 -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 S1161418AbbKFLgl (ORCPT + 28 others); Fri, 6 Nov 2015 06:36:41 -0500 Received: from mail-pa0-f53.google.com ([209.85.220.53]:36272 "EHLO mail-pa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161397AbbKFLge (ORCPT ); Fri, 6 Nov 2015 06:36:34 -0500 Received: by pacdm15 with SMTP id dm15so96668119pac.3 for ; Fri, 06 Nov 2015 03:36:34 -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=uF7FPIyqxJqyLy31sJCOK9l4/HKUL2urH9UknvfVlU8=; b=rkymrbDjgpUmplF3o5UzgI8WBSZkyN9E7mzClyC0pRkQgwlvsn9sTwl4mBqZZQGjBs KbZ6BK9RTPacUphflRf/31m9I5DsZPcndiTYNGPfRuB7uu3+AtpwD5iIdLsHgVq4iq/9 Chb0IFl/73B7ReSn1d8GCU8kNJmI0cG78J5Zq2TGMAFaoRbwxjujeujtHurjzNcJ1SHh 4enLw7F6Gr7qokXlxJXchDjYjwocftELRVmB81veFqqztHvOmKsgUs+PXZD1ZopJg9i6 nXTrFFF2w3m3AHBZrmaX+I8E9C5PzJVlFhG0ZAYgzu3gsqlTgikqvw/PfbmrkJSDUOU/ N4kQ== 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=uF7FPIyqxJqyLy31sJCOK9l4/HKUL2urH9UknvfVlU8=; b=ltHyz9hIzWJb/PYCc8yVUHxuCP9hsHOs4qJ2pi8Ujtb5+u+48HbQmQLNFXCszoVRPM CZtZ57w2fHXOQS8nmclE7A31k1cAIUuoQKy50GR5JIh+e/uL5RaIhyRtWBiVUSjKtuGs 4keqXRXjjxts1bRNLdh82MHxpiCDzuLXcfjqAtOFN7OV3qA35idh5ONYVJk+Mf2dKz+X kycOZBy9gir/vKid1ytdBhfIyDRK+pl1Nnd4V+R3hcURVl0hpTNuJQ8Uy71X4m8vTYzA 8azNTZCmpWJVpoCPuR8xcZ3fzB3s6XxLEBUtKhYFGShIka+2TR6BPuDgF/jb2fSTV2bD ASbA== X-Gm-Message-State: ALoCoQmiUZue1zMukjKrANmQFKJ1xxoZf51smi0j5nCmoXcYo8hOZGFQsynpjJqrUaTzUcnKdCHq X-Received: by 10.66.234.194 with SMTP id ug2mr17594314pac.122.1446809794240; Fri, 06 Nov 2015 03:36:34 -0800 (PST) Received: from baolinwangubtpc.spreadtrum.com ([175.111.195.49]) by smtp.gmail.com with ESMTPSA id xm4sm13644680pab.27.2015.11.06.03.36.28 (version=TLSv1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 06 Nov 2015 03:36:33 -0800 (PST) From: Baolin Wang To: balbi@ti.com, sre@kernel.org, dbaryshkov@gmail.com, dwmw2@infradead.org Cc: broonie@kernel.org, linux-kernel@vger.kernel.org, baolin.wang@linaro.org, gregkh@linuxfoundation.org, peter.chen@freescale.com, stern@rowland.harvard.edu, r.baldyga@samsung.com, yoshihiro.shimoda.uh@renesas.com, linux-usb@vger.kernel.org, device-mainlining@lists.linuxfoundation.org, sameo@linux.intel.com, lee.jones@linaro.org, ckeepax@opensource.wolfsonmicro.com, patches@opensource.wolfsonmicro.com, linux-pm@vger.kernel.org Subject: [PATCH v5 5/5] power: wm831x_power: Support USB charger current limit management Date: Fri, 6 Nov 2015 19:35:14 +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 db11ae6..33ae27a 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 *********************************************************************/ @@ -606,8 +646,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];