diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2010-10-27 14:11:36 +0000 |
|---|---|---|
| committer | Lars-Peter Clausen <lars@metafoo.de> | 2010-10-27 14:11:36 +0000 |
| commit | 4b67cfb58ce2a66021d2882f9a842541f3503bcd (patch) | |
| tree | 78ca65675df384fdedb3fbdd4ea37b86982caffb /target/linux/xburst/patches-2.6.36/301-mfd-adc-fixes.patch | |
| parent | 98cc28e7d70fa663467f647fc82c79dfd2520f6c (diff) | |
| download | master-31e0f0ae-4b67cfb58ce2a66021d2882f9a842541f3503bcd.tar.gz master-31e0f0ae-4b67cfb58ce2a66021d2882f9a842541f3503bcd.tar.bz2 master-31e0f0ae-4b67cfb58ce2a66021d2882f9a842541f3503bcd.zip | |
ADC and battery fixes * Fix concurrent battery readings * Add missing kfree in battery driver remove * Fix disabling of a ADC component
SVN-Revision: 23670
Diffstat (limited to 'target/linux/xburst/patches-2.6.36/301-mfd-adc-fixes.patch')
| -rw-r--r-- | target/linux/xburst/patches-2.6.36/301-mfd-adc-fixes.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/target/linux/xburst/patches-2.6.36/301-mfd-adc-fixes.patch b/target/linux/xburst/patches-2.6.36/301-mfd-adc-fixes.patch new file mode 100644 index 0000000000..173a0ee93f --- /dev/null +++ b/target/linux/xburst/patches-2.6.36/301-mfd-adc-fixes.patch @@ -0,0 +1,25 @@ +From 1abac8c26df9112efee5da078f163b1c32075037 Mon Sep 17 00:00:00 2001 +From: Axel Lin <axel.lin@gmail.com> +Date: Thu, 7 Oct 2010 15:51:20 +0800 +Subject: [PATCH] mfd: Fix jz4740_adc_set_enabled + +When enabled is false, clear BIT(engine) of JZ_REG_ADC_ENABLE register. + +Signed-off-by: Axel Lin <axel.lin@gmail.com> +Acked-by: Lars-Peter Clausen <lars@metafoo.de> +Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> +--- + drivers/mfd/jz4740-adc.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +--- a/drivers/mfd/jz4740-adc.c ++++ b/drivers/mfd/jz4740-adc.c +@@ -154,7 +154,7 @@ static inline void jz4740_adc_set_enable + if (enabled) + val |= BIT(engine); + else +- val &= BIT(engine); ++ val &= ~BIT(engine); + writeb(val, adc->base + JZ_REG_ADC_ENABLE); + + spin_unlock_irqrestore(&adc->lock, flags); |