USB: disable twl4030 USB regulators when cable unplugged
PATCH 2/2 USB: disable twl4030 USB regulators when cable unplugged
From: Kalle Jokiniemi <[email protected]>
This patch disables LDO regulators VUSB1V5, VUSB1V8, and VUSB3V1 when the USB cable is unplugged, to eliminate that source of power waste. (Enabled LDOs consume power at all times.)
---
Depends on the twl4030 regulator driver, so I'm suggesting this be merged (with that driver) through the regulator patch queue to simplify things.
drivers/usb/otg/twl4030-usb.c | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-)
drivers/usb/otg/twl4030-usb.c +24 -6
@@ -34,6 +34,7 @@#include <linux/delay.h> #include <linux/usb/otg.h> #include <linux/i2c/twl4030.h> +#include <linux/regulator/consumer.h> /* Register defines */
@@ -246,6 +247,11 @@ struct twl4030_usb {struct otg_transceiver otg;struct device *dev; +/* TWL4030 internal USB regulator supplies */ +struct regulator *usb1v5; +struct regulator *usb1v8; +struct regulator *usb3v1; +/* for vbus reporting with irqs disabled */ spinlock_t lock;
@@ -434,6 +440,9 @@ static void twl4030_phy_power(struct twl pwr =twl4030_usb_read (twl,PHY_PWR_CTRL );if (on) { +regulator_enable (twl->usb1v5); +regulator_enable (twl->usb1v8); +regulator_enable (twl->usb3v1); pwr &= ~PHY_PWR_PHYPWD ;WARN_ON (twl4030_usb_write_verify (twl,PHY_PWR_CTRL , pwr) <0 ); twl4030_usb_write(twl, PHY_CLK_CTRL,
@@ -443,6 +452,9 @@ static void twl4030_phy_power(struct twl }else { pwr |=PHY_PWR_PHYPWD ;WARN_ON (twl4030_usb_write_verify (twl,PHY_PWR_CTRL , pwr) <0 ); +regulator_disable (twl->usb1v5); +regulator_disable (twl->usb1v8); +regulator_disable (twl->usb3v1); } }
@@ -480,16 +492,19 @@ static void twl4030_usb_ldo_init(struct/* input to VUSB3V1 LDO is from VBAT, not VBUS */ twl4030_i2c_write_u8 (TWL4030_MODULE_PM_RECEIVER ,0x14 ,VUSB_DEDICATED1 ); -/* turn on 3.1V regulator */ -twl4030_i2c_write_u8 (TWL4030_MODULE_PM_RECEIVER ,0x20 ,VUSB3V1_DEV_GRP ); +/* Initialize 3.1V regulator */ +twl4030_i2c_write_u8 (TWL4030_MODULE_PM_RECEIVER ,0 ,VUSB3V1_DEV_GRP ); + twl->usb3v1 =regulator_get (twl->dev,"usb3v1" );twl4030_i2c_write_u8 (TWL4030_MODULE_PM_RECEIVER ,0 ,VUSB3V1_TYPE ); -/* turn on 1.5V regulator */ -twl4030_i2c_write_u8 (TWL4030_MODULE_PM_RECEIVER ,0x20 ,VUSB1V5_DEV_GRP ); +/* Initialize 1.5V regulator */ +twl4030_i2c_write_u8 (TWL4030_MODULE_PM_RECEIVER ,0 ,VUSB1V5_DEV_GRP ); + twl->usb1v5 =regulator_get (twl->dev,"usb1v5" );twl4030_i2c_write_u8 (TWL4030_MODULE_PM_RECEIVER ,0 ,VUSB1V5_TYPE ); -/* turn on 1.8V regulator */ -twl4030_i2c_write_u8 (TWL4030_MODULE_PM_RECEIVER ,0x20 ,VUSB1V8_DEV_GRP ); +/* Initialize 1.8V regulator */ +twl4030_i2c_write_u8 (TWL4030_MODULE_PM_RECEIVER ,0 ,VUSB1V8_DEV_GRP ); + twl->usb1v8 =regulator_get (twl->dev,"usb1v8" );twl4030_i2c_write_u8 (TWL4030_MODULE_PM_RECEIVER ,0 ,VUSB1V8_TYPE );/* disable access to power configuration registers */
@@ -688,6 +703,9 @@ static int __exit twl4030_usb_remove(strtwl4030_usb_clear_bits (twl,POWER_CTRL ,POWER_CTRL_OTG_ENAB );twl4030_phy_power (twl,0 ); +regulator_put (twl->usb1v5); +regulator_put (twl->usb1v8); +regulator_put (twl->usb3v1);kfree (twl);
Quoted 5 lines · David Brownell
From: Kalle Jokiniemi <[email protected]>
This patch disables LDO regulators VUSB1V5, VUSB1V8, and VUSB3V1 when the USB cable is unplugged, to eliminate that source of power waste. (Enabled LDOs consume power at all times.)
Please put this one on hold.
A bug has been discovered here. If the twl-regulator is not compiled in, the twl4030-usb fails while trying to access the reg-fw interfaces (and not checking error values). Also it's bit confusing how we get different error values if reg_fw is not compiled (no error) vs. reg_fw is compiled, but twl_regulator is not... (error)
Also problems with boot order were discovered.
I'll post a set that fixes this soon.
- Kalle
Quoted 89 lines
Signed-off-by Kalle Jokiniemi <[email protected]>Signed-off-by David Brownell <[email protected]>---
Depends on the twl4030 regulator driver, so I'm suggesting this be merged (with that driver) through the regulator patch queue to simplify things.drivers/usb/otg/twl4030-usb.c | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-)drivers/usb/otg/twl4030-usb.c +24
-6@@ -34,6 +34,7 @@#include <linux/delay.h> #include <linux/usb/otg.h> #include <linux/i2c/twl4030.h> +#include <linux/regulator/consumer.h> /* Register defines */ @@ -246,6 +247,11 @@ struct twl4030_usb {struct otg_transceiver otg;struct device *dev; +/* TWL4030 internal USB regulator supplies */ +struct regulator *usb1v5; +struct regulator *usb1v8; +struct regulator *usb3v1; +/* for vbus reporting with irqs disabled */ spinlock_t lock;@@ -434,6 +440,9 @@ static void twl4030_phy_power(struct twl pwr =twl4030_usb_read (twl,PHY_PWR_CTRL );if (on) { +regulator_enable (twl->usb1v5); +regulator_enable (twl->usb1v8); +regulator_enable (twl->usb3v1); pwr &= ~PHY_PWR_PHYPWD ;WARN_ON (twl4030_usb_write_verify (twl,PHY_PWR_CTRL , pwr) <0 ); twl4030_usb_write(twl, PHY_CLK_CTRL,@@ -443,6 +452,9 @@ static void twl4030_phy_power(struct twl }else { pwr |=PHY_PWR_PHYPWD ;WARN_ON (twl4030_usb_write_verify (twl,PHY_PWR_CTRL , pwr) <0 ); +regulator_disable (twl->usb1v5); +regulator_disable (twl->usb1v8); +regulator_disable (twl->usb3v1); } }@@ -480,16 +492,19 @@ static void twl4030_usb_ldo_init(struct/* input to VUSB3V1 LDO is from VBAT, not VBUS */ twl4030_i2c_write_u8 (TWL4030_MODULE_PM_RECEIVER ,0x14 ,VUSB_DEDICATED1 ); -/* turn on 3.1V regulator */ -twl4030_i2c_write_u8 (TWL4030_MODULE_PM_RECEIVER ,0x20 ,VUSB3V1_DEV_GRP ); +/* Initialize 3.1V regulator */ +twl4030_i2c_write_u8 (TWL4030_MODULE_PM_RECEIVER ,0 ,VUSB3V1_DEV_GRP ); + twl->usb3v1 =regulator_get (twl->dev,"usb3v1" );twl4030_i2c_write_u8 (TWL4030_MODULE_PM_RECEIVER ,0 ,VUSB3V1_TYPE ); -/* turn on 1.5V regulator */ -twl4030_i2c_write_u8 (TWL4030_MODULE_PM_RECEIVER ,0x20 ,VUSB1V5_DEV_GRP ); +/* Initialize 1.5V regulator */ +twl4030_i2c_write_u8 (TWL4030_MODULE_PM_RECEIVER ,0 ,VUSB1V5_DEV_GRP ); + twl->usb1v5 =regulator_get (twl->dev,"usb1v5" );twl4030_i2c_write_u8 (TWL4030_MODULE_PM_RECEIVER ,0 ,VUSB1V5_TYPE ); -/* turn on 1.8V regulator */ -twl4030_i2c_write_u8 (TWL4030_MODULE_PM_RECEIVER ,0x20 ,VUSB1V8_DEV_GRP ); +/* Initialize 1.8V regulator */ +twl4030_i2c_write_u8 (TWL4030_MODULE_PM_RECEIVER ,0 ,VUSB1V8_DEV_GRP ); + twl->usb1v8 =regulator_get (twl->dev,"usb1v8" );twl4030_i2c_write_u8 (TWL4030_MODULE_PM_RECEIVER ,0 ,VUSB1V8_TYPE );/* disable access to power configuration registers */ @@ -688,6 +703,9 @@ static int __exit twl4030_usb_remove(strtwl4030_usb_clear_bits (twl,POWER_CTRL ,POWER_CTRL_OTG_ENAB );twl4030_phy_power (twl,0 ); +regulator_put (twl->usb1v5); +regulator_put (twl->usb1v8); +regulator_put (twl->usb3v1);kfree (twl);
Quoted 2 lines · Kalle Jokiniemi
A bug has been discovered here. If the twl-regulator is not compiled in, the twl4030-usb fails while trying to access the reg-fw interfaces (and
reg-fw is the regulator framework?
Quoted 3 lines
not checking error values). Also it's bit confusing how we get different error values if
reg_fwis not compiled (no error) vs.reg_fwis compiled, buttwl_regulatoris not... (error)
The general model is that if you've got regulator API support enabled then you'll have the relevant regulator drivers enabled. The support for compiling out the core is intended to allow configurations that don't use regulators at all. This is a bit restrictive but works well for most users.
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 5 lines · David Brownell
From: Kalle Jokiniemi <[email protected]>
This patch disables LDO regulators VUSB1V5, VUSB1V8, and VUSB3V1 when the USB cable is unplugged, to eliminate that source of power waste. (Enabled LDOs consume power at all times.)
Please put this on hold for a while. This won't work if we don't have TWL regulator support enabled. Also it's missing error value checking.
I'll post new patch(es) soon.
- Kalle
Quoted 80 lines
Signed-off-by Kalle Jokiniemi <[email protected]>Signed-off-by David Brownell <[email protected]>---
Depends on the twl4030 regulator driver, so I'm suggesting this be merged (with that driver) through the regulator patch queue to simplify things.drivers/usb/otg/twl4030-usb.c | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-)drivers/usb/otg/twl4030-usb.c +21
-6@@ -34,6 +34,7 @@#include <linux/delay.h> #include <linux/usb/otg.h> #include <linux/i2c/twl4030.h> +#include <linux/regulator/consumer.h> /* Register defines */ @@ -246,6 +247,11 @@ struct twl4030_usb {struct otg_transceiver otg;struct device *dev; +/* TWL4030 internal USB regulator supplies */ +struct regulator *usb1v5; +struct regulator *usb1v8; +struct regulator *usb3v1; +/* for vbus reporting with irqs disabled */ spinlock_t lock;@@ -434,6 +440,9 @@ static void twl4030_phy_power(struct twl pwr =twl4030_usb_read (twl,PHY_PWR_CTRL );if (on) { +regulator_enable (twl->usb1v5); +regulator_enable (twl->usb1v8); +regulator_enable (twl->usb3v1); pwr &= ~PHY_PWR_PHYPWD ;WARN_ON (twl4030_usb_write_verify (twl,PHY_PWR_CTRL , pwr) <0 ); twl4030_usb_write(twl, PHY_CLK_CTRL,@@ -443,6 +452,9 @@ static void twl4030_phy_power(struct twl }else { pwr |=PHY_PWR_PHYPWD ;WARN_ON (twl4030_usb_write_verify (twl,PHY_PWR_CTRL , pwr) <0 ); +regulator_disable (twl->usb1v5); +regulator_disable (twl->usb1v8); +regulator_disable (twl->usb3v1); } }@@ -480,16 +492,19 @@ static void twl4030_usb_ldo_init(struct/* input to VUSB3V1 LDO is from VBAT, not VBUS */ twl4030_i2c_write_u8 (TWL4030_MODULE_PM_RECEIVER ,0x14 ,VUSB_DEDICATED1 ); -/* turn on 3.1V regulator */ -twl4030_i2c_write_u8 (TWL4030_MODULE_PM_RECEIVER ,0x20 ,VUSB3V1_DEV_GRP ); +/* Initialize 3.1V regulator */ +twl4030_i2c_write_u8 (TWL4030_MODULE_PM_RECEIVER ,0 ,VUSB3V1_DEV_GRP ); + twl->usb3v1 =regulator_get (twl->dev,"usb3v1" );twl4030_i2c_write_u8 (TWL4030_MODULE_PM_RECEIVER ,0 ,VUSB3V1_TYPE ); -/* turn on 1.5V regulator */ -twl4030_i2c_write_u8 (TWL4030_MODULE_PM_RECEIVER ,0x20 ,VUSB1V5_DEV_GRP ); +/* Initialize 1.5V regulator */ +twl4030_i2c_write_u8 (TWL4030_MODULE_PM_RECEIVER ,0 ,VUSB1V5_DEV_GRP ); + twl->usb1v5 =regulator_get (twl->dev,"usb1v5" );twl4030_i2c_write_u8 (TWL4030_MODULE_PM_RECEIVER ,0 ,VUSB1V5_TYPE ); -/* turn on 1.8V regulator */ -twl4030_i2c_write_u8 (TWL4030_MODULE_PM_RECEIVER ,0x20 ,VUSB1V8_DEV_GRP ); +/* Initialize 1.8V regulator */ +twl4030_i2c_write_u8 (TWL4030_MODULE_PM_RECEIVER ,0 ,VUSB1V8_DEV_GRP ); + twl->usb1v8 =regulator_get (twl->dev,"usb1v8" );twl4030_i2c_write_u8 (TWL4030_MODULE_PM_RECEIVER ,0 ,VUSB1V8_TYPE );/* disable access to power configuration registers */
drivers/usb/otg/twl4030-usb.c static int __exit twl4030_usb_remove(str · line 711
Quoted 9 lines
drivers/usb/otg/twl4030-usb.c +3
-0@@ -688,6 +703,9 @@ static int __exit twl4030_usb_remove(strtwl4030_usb_clear_bits (twl,POWER_CTRL ,POWER_CTRL_OTG_ENAB );twl4030_phy_power (twl,0 ); +regulator_put (twl->usb1v5); +regulator_put (twl->usb1v8); +regulator_put (twl->usb3v1);kfree (twl);
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 6 lines · Kalle Jokiniemi
Quoted 3 lines
This patch disables LDO regulators VUSB1V5, VUSB1V8, and VUSB3V1 when the USB cable is unplugged, to eliminate that source of power waste. (Enabled LDOs consume power at all times.)
Please put this on hold for a while. This won't work if we don't have TWL regulator support enabled.
So Kconfig should have TWL4030_USB depend on REGULATOR_TWL4030?
Quoted 1 line
Also it's missing error value checking.
You mean like in the ldo_init() stuff? Fair enough.
- Dave
Quoted 2 lines
I'll post new patch(es) soon.
A message that is not in the archive (sent off-list or not yet received): 200902101152.59526.david-b-yBeKhBN/[email protected]
Quoted 9 lines · David Brownell
Quoted 6 lines · Kalle Jokiniemi
Quoted 3 lines
This patch disables LDO regulators VUSB1V5, VUSB1V8, and VUSB3V1 when the USB cable is unplugged, to eliminate that source of power waste. (Enabled LDOs consume power at all times.)
Please put this on hold for a while. This won't work if we don't have TWL regulator support enabled.
So
Kconfigshould haveTWL4030_USBdepend onREGULATOR_TWL4030?
Yes.
Quoted 5 lines
Quoted 3 lines
Also it's missing error value checking.
You mean like in the
ldo_init()stuff? Fair enough.
I mean, if regulator_get fails.
- Kalle
Quoted 7 lines
- Dave
Quoted 2 lines
I'll post new patch(es) soon.
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Liam Girdwood
AppliedQuoted 8 lines · David Brownell
From: Kalle Jokiniemi <[email protected]>
This patch disables LDO regulators VUSB1V5, VUSB1V8, and VUSB3V1 when the USB cable is unplugged, to eliminate that source of power waste. (Enabled LDOs consume power at all times.)
Signed-off-by Kalle Jokiniemi <[email protected]>Signed-off-by David Brownell <[email protected]>
Quoted 7 lines
---
Depends on the twl4030 regulator driver, so I'm suggesting this be merged (with that driver) through the regulator patch queue to simplify things.drivers/usb/otg/twl4030-usb.c | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-)
Applied.
Thanks
Liam
Quoted 14 lines · Liam Girdwood
Quoted 13 lines · David Brownell
From: Kalle Jokiniemi <[email protected]>
This patch disables LDO regulators VUSB1V5, VUSB1V8, and VUSB3V1 when the USB cable is unplugged, to eliminate that source of power waste. (Enabled LDOs consume power at all times.)
Signed-off-by Kalle Jokiniemi <[email protected]>Signed-off-by David Brownell <[email protected]>---
Depends on the twl4030 regulator driver, so I'm suggesting this be merged (with that driver) through the regulator patch queue to simplify things.
Quoted 4 lines
Quoted 2 lines
drivers/usb/otg/twl4030-usb.c | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-)Applied.
Better suggestion: grab Kalle's updated patch from Greg's USB queue:
http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-04-usb/
patch name usb-twl-disable-vusb-regulators-when-cable-unplugged.patch
- Dave
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 18 lines · David Brownell
Quoted 17 lines · Liam Girdwood
Quoted 15 lines · David Brownell
From: Kalle Jokiniemi <[email protected]>
This patch disables LDO regulators VUSB1V5, VUSB1V8, and VUSB3V1 when the USB cable is unplugged, to eliminate that source of power waste. (Enabled LDOs consume power at all times.)
Signed-off-by Kalle Jokiniemi <[email protected]>Signed-off-by David Brownell <[email protected]>---
Depends on the twl4030 regulator driver, so I'm suggesting this be merged (with that driver) through the regulator patch queue to simplify things.drivers/usb/otg/twl4030-usb.c | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-)
Quoted 8 lines
Quoted 1 line
Applied.
Better suggestion: grab Kalle's updated patch from Greg's USB queue:
http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-04-usb/
patch name usb-twl-disable-vusb-regulators-when-cable-unplugged.patch
Yep, this previous one lacked some error checks and a build dependency to TWL_REGULATOR.
- Kalle
Quoted 2 lines
- Dave
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 24 lines · Kalle Jokiniemi
Quoted 23 lines · David Brownell
Quoted 14 lines · Liam Girdwood
Quoted 13 lines · David Brownell
From: Kalle Jokiniemi <[email protected]>
This patch disables LDO regulators VUSB1V5, VUSB1V8, and VUSB3V1 when the USB cable is unplugged, to eliminate that source of power waste. (Enabled LDOs consume power at all times.)
Signed-off-by Kalle Jokiniemi <[email protected]>Signed-off-by David Brownell <[email protected]>---
Depends on the twl4030 regulator driver, so I'm suggesting this be merged (with that driver) through the regulator patch queue to simplify things.Quoted 4 lines
Quoted 2 lines
drivers/usb/otg/twl4030-usb.c | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-)Applied.
Better suggestion: grab Kalle's updated patch from Greg's USB queue:
Quoted 7 lines
Quoted 3 lines
http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-04-usb/
patch name usb-twl-disable-vusb-regulators-when-cable-unplugged.patch
Yep, this previous one lacked some error checks and a build dependency to
TWL_REGULATOR.
I've now removed this patch from the regulator tree. I guess Greg will take care of it via the USB tree now.
Thanks
Liam