Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757296Ab2EHVlx (ORCPT ); Tue, 8 May 2012 17:41:53 -0400 Received: from cantor2.suse.de ([195.135.220.15]:50508 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756090Ab2EHVlv (ORCPT ); Tue, 8 May 2012 17:41:51 -0400 From: NeilBrown To: Samuel Ortiz , Felipe Balbi , Anton Vorontsov , David Woodhouse Date: Wed, 09 May 2012 07:40:40 +1000 Subject: [PATCH 4/4] usb: otg: twl4030-usb: Don't power down phy when it is in-use by charger. Cc: Grazvydas Ignotas , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, NeilBrown Message-ID: <20120508214040.2844.81364.stgit@notabene.brown> In-Reply-To: <20120508213518.2844.95446.stgit@notabene.brown> References: <20120508213518.2844.95446.stgit@notabene.brown> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1358 Lines: 41 The USB phy is used both for data transfer and to charge the battery. If the charger is active it will hold a reference to usb3v1. In that case we don't want to power-down the phy. This allows charging to continue while the device is suspended. Signed-off-by: NeilBrown --- drivers/usb/otg/twl4030-usb.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/usb/otg/twl4030-usb.c b/drivers/usb/otg/twl4030-usb.c index c4a86da..bd8fe9b 100644 --- a/drivers/usb/otg/twl4030-usb.c +++ b/drivers/usb/otg/twl4030-usb.c @@ -388,10 +388,16 @@ static void twl4030_phy_power(struct twl4030_usb *twl, int on) (PHY_CLK_CTRL_CLOCKGATING_EN | PHY_CLK_CTRL_CLK32K_EN)); } else { - __twl4030_phy_power(twl, 0); regulator_disable(twl->usb1v5); regulator_disable(twl->usb1v8); regulator_disable(twl->usb3v1); + if (!regulator_is_enabled(twl->usb3v1)) + /* no-one else is requesting this + * so it is OK to power-down the + * phy. Sometimes a charger might + * hold the regulator active. + */ + __twl4030_phy_power(twl, 0); } } -- 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/