From patchwork Mon Nov 16 06:33:34 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: 56571 Delivered-To: patch@linaro.org Received: by 10.112.155.196 with SMTP id vy4csp1142892lbb; Sun, 15 Nov 2015 22:34:44 -0800 (PST) X-Received: by 10.68.108.66 with SMTP id hi2mr52367788pbb.131.1447655684627; Sun, 15 Nov 2015 22:34:44 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id kk7si5331432pab.220.2015.11.15.22.34.44; Sun, 15 Nov 2015 22:34:44 -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 S1751946AbbKPGei (ORCPT + 28 others); Mon, 16 Nov 2015 01:34:38 -0500 Received: from mail-pa0-f41.google.com ([209.85.220.41]:35445 "EHLO mail-pa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751832AbbKPGeY (ORCPT ); Mon, 16 Nov 2015 01:34:24 -0500 Received: by pacej9 with SMTP id ej9so58320689pac.2 for ; Sun, 15 Nov 2015 22:34:23 -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=SZd+wfNSZhKYXlo3eAi+q7NlHIjAnGyAcsSAo8sXd10pjkPMGi5Zp9T7gaDSE5lhhg nPVGGOqj4ykZePUlXVhjKAi2jufK12tG8hsUuv9xpXOWzxAANVwWOzU6oFxRMzHJUXDh XFaPU/b6UYPkMdfdYP/YnIc+PW+Rhj0FP2dk9QsW5yIc2jbOS6Vqp5Q0V640UZyQCfBa ZCFYgpt571XVFLKDxNt+lUqrg21m9yu5K1cC9XCW9wnLIzhR3s9V16OaC/UhTk8neDsD Q685Lp5/4HTTxaXS3g3erjteKuDge4J3Sq/ZTbP2I+GNEyEBH8dN8fgpGbxwAfi8sz3b nMZA== 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=EhLcMRYrFq16jKAQbIf2nDLei7HR4EMvZp+vmuFD95uMxfR0PnPwntljIx84ksQJpq QiB7UQ/wae7m4xpU2uKwEGtef1t6JgWF4iofockpq4l/q+No6UoJGE4SoKW7YkWRW2L0 nhPcTLrJbykcQdcP9zNPeu0m3tICLnNFNZdmjD7r1FZ7QPTo+vx/880nrNJR5Z9Wb7bf CiCGPdrO8CmfGEE/hI4VsuySAfvBCfWsvMiGgY2wLZ4IxMnn27/njwC37Vl6OmSHFHak BXpFKQEIAHlrIuagpqdhEzf56J+brhB1O6Eel4tbNmgAQ0eTZf5YPkVG0faqZZ8NwAka nKuw== X-Gm-Message-State: ALoCoQkLdyyDbN2CiFoVaNi1/37c2XH5NNIY2GJJYbe9AcD4ncoTPTcT0948NDbUr3a7B2OBYYTU X-Received: by 10.66.119.174 with SMTP id kv14mr52166071pab.143.1447655663706; Sun, 15 Nov 2015 22:34:23 -0800 (PST) Received: from baolinwangubtpc.spreadtrum.com ([175.111.195.49]) by smtp.gmail.com with ESMTPSA id l9sm32535196pbq.43.2015.11.15.22.34.18 (version=TLSv1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 15 Nov 2015 22:34:23 -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 v6 4/4] power: wm831x_power: Support USB charger current limit management Date: Mon, 16 Nov 2015 14:33:34 +0800 Message-Id: <8115d1cccdb33b5d012bfe912d3ae3fafdcd67ad.1447654606.git.baolin.wang@linaro.org> 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];