diff options
| author | Mirko Vogt <mirko@openwrt.org> | 2008-12-13 01:54:56 +0000 |
|---|---|---|
| committer | Mirko Vogt <mirko@openwrt.org> | 2008-12-13 01:54:56 +0000 |
| commit | c931b21161bf3d8a8cab193045b7deb52f914fb2 (patch) | |
| tree | 6f4c70017b90c8dddb4845ce8a363d61268e016d /target/linux/s3c24xx/patches-2.6.26/1088-fix-charging-deassert-host-power-1a-detect.patch.patch | |
| parent | 738e5ca558af0a32073576d9a361d0b5e6383e8e (diff) | |
| download | master-31e0f0ae-c931b21161bf3d8a8cab193045b7deb52f914fb2.tar.gz master-31e0f0ae-c931b21161bf3d8a8cab193045b7deb52f914fb2.tar.bz2 master-31e0f0ae-c931b21161bf3d8a8cab193045b7deb52f914fb2.zip | |
change prefix for kernelpatchbase 2.6.26
SVN-Revision: 13619
Diffstat (limited to 'target/linux/s3c24xx/patches-2.6.26/1088-fix-charging-deassert-host-power-1a-detect.patch.patch')
| -rwxr-xr-x | target/linux/s3c24xx/patches-2.6.26/1088-fix-charging-deassert-host-power-1a-detect.patch.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/target/linux/s3c24xx/patches-2.6.26/1088-fix-charging-deassert-host-power-1a-detect.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1088-fix-charging-deassert-host-power-1a-detect.patch.patch new file mode 100755 index 0000000000..67fde72940 --- /dev/null +++ b/target/linux/s3c24xx/patches-2.6.26/1088-fix-charging-deassert-host-power-1a-detect.patch.patch @@ -0,0 +1,36 @@ +From f78f3a4decb7e67b5349a2c088449342398d2114 Mon Sep 17 00:00:00 2001 +From: Andy Green <andy@openmoko.com> +Date: Fri, 25 Jul 2008 23:06:01 +0100 +Subject: [PATCH] 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> +--- + 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 91b9ac3..c14fad0 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; + } + } +-- +1.5.6.3 + |