diff options
| author | Andy Green <andy@openmoko.com> | 2008-11-19 17:09:34 +0000 |
|---|---|---|
| committer | Andy Green <agreen@pads.home.warmcat.com> | 2008-11-19 17:09:34 +0000 |
| commit | c7f95ad254e93840ebb576d9a7a1a7a2800f9da8 (patch) | |
| tree | b383ef720dc67f31c45ee3200915db962cde678f /drivers/i2c | |
| parent | 24dcaf38a0c622c7e9b1db700d9bd98f81bb0dc9 (diff) | |
fix-charging-deassert-host-power-1a-detect.patch
We don't take care to stop driving generated USB host power even
when we have a 1A charger connected on the same pins.
Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/chips/pcf50633.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c index 91b9ac332e1..c14fad01c79 100644 --- a/drivers/i2c/chips/pcf50633.c +++ b/drivers/i2c/chips/pcf50633.c @@ -523,6 +523,15 @@ static void configure_pmu_for_charger(struct pcf50633_data *pcf, break; case CHARGER_TYPE_1A: __reg_write(pcf, PCF50633_REG_MBCC7, PCF50633_MBCC7_USB_1000mA); + /* + * stop GPO / EN_HOSTUSB power driving out on the same + * USB power pins we have a 1A charger on right now! + */ + dev_info(&pcf->client.dev, "Charger -> CHARGER_TYPE_1A\n"); + __reg_write(pcf, PCF50633_GPO - PCF50633_GPIO1 + + PCF50633_REG_GPIO1CFG, + __reg_read(pcf, PCF50633_GPO - PCF50633_GPIO1 + + PCF50633_REG_GPIO1CFG) & 0xf0); break; } } |