Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752978AbbBYHY4 (ORCPT ); Wed, 25 Feb 2015 02:24:56 -0500 Received: from mail-wi0-f177.google.com ([209.85.212.177]:40546 "EHLO mail-wi0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752483AbbBYHYy (ORCPT ); Wed, 25 Feb 2015 02:24:54 -0500 Date: Wed, 25 Feb 2015 07:24:43 +0000 From: Lee Jones To: NeilBrown Cc: Samuel Ortiz , Tony Lindgren , Sebastian Reichel , Dmitry Eremin-Solenikov , David Woodhouse , GTA04 owners , linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org Subject: Re: [PATCH 04/15] twl4030_charger: use runtime_pm to keep usb phy active while charging. Message-ID: <20150225072443.GG21323@x1> References: <20150224043341.4243.23291.stgit@notabene.brown> <20150224043350.4243.51289.stgit@notabene.brown> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20150224043350.4243.51289.stgit@notabene.brown> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4951 Lines: 141 On Tue, 24 Feb 2015, NeilBrown wrote: > The twl4030 usb phy needs to be active while we are using > the USB VBUS as a current source for charging. > In particular, the usb3v1 regulator must be enabled and the > PHY_PWR_PHYPWD bit must be set to keep the phy powered. > > commit ab37813f4093a5f59cb8e083cde277289dc72ed3 > twl4030_charger: Allow charger to control the regulator that feeds it > > Gave the charger control over the regulator, but didn't resolve > the PHY_PWR_PHYPWD issue. > > Now that both of these are controlled by runtime_pm in > phy-twl4030-usb, we can simply take a runtime_pm reference to the USB > phy whenever the charger wants to use it as a current source. > > So this patch reverts the above commit, and adds the necessary > runtime_pm calls. > > Signed-off-by: NeilBrown > --- > drivers/mfd/twl-core.c | 9 ++++----- Acked-by: Lee Jones > drivers/power/twl4030_charger.c | 18 +++++------------- > 2 files changed, 9 insertions(+), 18 deletions(-) > > diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c > index 489674a2497e..831696ee2472 100644 > --- a/drivers/mfd/twl-core.c > +++ b/drivers/mfd/twl-core.c > @@ -788,9 +788,8 @@ add_children(struct twl4030_platform_data *pdata, unsigned irq_base, > static struct regulator_consumer_supply usb1v8 = { > .supply = "usb1v8", > }; > - static struct regulator_consumer_supply usb3v1[] = { > - { .supply = "usb3v1" }, > - { .supply = "bci3v1" }, > + static struct regulator_consumer_supply usb3v1 = { > + .supply = "usb3v1", > }; > > /* First add the regulators so that they can be used by transceiver */ > @@ -818,7 +817,7 @@ add_children(struct twl4030_platform_data *pdata, unsigned irq_base, > return PTR_ERR(child); > > child = add_regulator_linked(TWL4030_REG_VUSB3V1, > - &usb_fixed, usb3v1, 2, > + &usb_fixed, &usb3v1, 1, > features); > if (IS_ERR(child)) > return PTR_ERR(child); > @@ -838,7 +837,7 @@ add_children(struct twl4030_platform_data *pdata, unsigned irq_base, > if (IS_ENABLED(CONFIG_REGULATOR_TWL4030) && child) { > usb1v5.dev_name = dev_name(child); > usb1v8.dev_name = dev_name(child); > - usb3v1[0].dev_name = dev_name(child); > + usb3v1.dev_name = dev_name(child); > } > } > > diff --git a/drivers/power/twl4030_charger.c b/drivers/power/twl4030_charger.c > index 51321f0c5548..11f352a5ef55 100644 > --- a/drivers/power/twl4030_charger.c > +++ b/drivers/power/twl4030_charger.c > @@ -22,7 +22,6 @@ > #include > #include > #include > -#include > > #define TWL4030_BCIMSTATEC 0x02 > #define TWL4030_BCIICHG 0x08 > @@ -94,7 +93,6 @@ struct twl4030_bci { > struct work_struct work; > int irq_chg; > int irq_bci; > - struct regulator *usb_reg; > int usb_enabled; > > unsigned long event; > @@ -208,7 +206,7 @@ static int twl4030_charger_enable_usb(struct twl4030_bci *bci, bool enable) > { > int ret; > > - if (enable) { > + if (enable && !IS_ERR_OR_NULL(bci->transceiver)) { > /* Check for USB charger connected */ > if (!twl4030_bci_have_vbus(bci)) > return -ENODEV; > @@ -222,14 +220,9 @@ static int twl4030_charger_enable_usb(struct twl4030_bci *bci, bool enable) > return -EACCES; > } > > - /* Need to keep regulator on */ > + /* Need to keep phy powered */ > if (!bci->usb_enabled) { > - ret = regulator_enable(bci->usb_reg); > - if (ret) { > - dev_err(bci->dev, > - "Failed to enable regulator\n"); > - return ret; > - } > + pm_runtime_get_sync(bci->transceiver->dev); > bci->usb_enabled = 1; > } > > @@ -244,7 +237,8 @@ static int twl4030_charger_enable_usb(struct twl4030_bci *bci, bool enable) > } else { > ret = twl4030_clear_set_boot_bci(TWL4030_BCIAUTOUSB, 0); > if (bci->usb_enabled) { > - regulator_disable(bci->usb_reg); > + pm_runtime_mark_last_busy(bci->transceiver->dev); > + pm_runtime_put_autosuspend(bci->transceiver->dev); > bci->usb_enabled = 0; > } > } > @@ -602,8 +596,6 @@ static int __init twl4030_bci_probe(struct platform_device *pdev) > bci->usb.num_properties = ARRAY_SIZE(twl4030_charger_props); > bci->usb.get_property = twl4030_bci_get_property; > > - bci->usb_reg = regulator_get(bci->dev, "bci3v1"); > - > ret = devm_power_supply_register(&pdev->dev, &bci->usb); > if (ret) { > dev_err(&pdev->dev, "failed to register usb: %d\n", ret); > > -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog -- 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/