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 | 4eec5435530060db9fa75ee3d363252eb73695e9 (patch) | |
tree | 01f2bf78edb2e3bb1466df9bca72e068632d0e74 /target/linux/s3c24xx/patches-2.6.26/1088-fix-charging-deassert-host-power-1a-detect.patch.patch | |
parent | b0f5b5307126b277c44fa71bbd8f105f6702a8c0 (diff) | |
download | upstream-4eec5435530060db9fa75ee3d363252eb73695e9.tar.gz upstream-4eec5435530060db9fa75ee3d363252eb73695e9.tar.bz2 upstream-4eec5435530060db9fa75ee3d363252eb73695e9.zip |
change prefix for kernelpatchbase 2.6.26
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13619 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 + |