diff options
| author | lars <lars@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-10-27 14:11:36 +0000 |
|---|---|---|
| committer | lars <lars@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-10-27 14:11:36 +0000 |
| commit | 2b87facd965c10e07878debf4c8fcaf6580c6f38 (patch) | |
| tree | 5b0ed74d70b67379b343a07b09dea87ffbda7f13 /target/linux/xburst/patches-2.6.36/301-mfd-adc-fixes.patch | |
| parent | 8ac283815a48057a2495f2ee6587f859f3bbb824 (diff) | |
[xburst] ADC and battery fixes
* Fix concurrent battery readings
* Add missing kfree in battery driver remove
* Fix disabling of a ADC component
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23670 3c298f89-4303-0410-b956-a3cf2f4a3e73
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); |