[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

2 files changed, 89 insertions, 0 deletions

diff --git a/target/linux/xburst/patches-2.6.36/300-battery-fixes.patch b/target/linux/xburst/patches-2.6.36/300-battery-fixes.patch
new file mode 100644
index 000000000..1aadb6acb
--- /dev/null
+++ b/target/linux/xburst/patches-2.6.36/300-battery-fixes.patch
@@ -0,0 +1,64 @@
+From 2d435d52c63e4dd544938bad638ecd518cc04d1c Mon Sep 17 00:00:00 2001
+From: Lars-Peter Clausen <lars@metafoo.de>
+Date: Tue, 26 Oct 2010 20:13:40 +0200
+Subject: [PATCH] POWER: jz4740-battery: Protect against concurrent battery readings
+
+We can not handle more then one ADC request at a time to the battery. The patch
+adds a mutex around the ADC read code to ensure this.
+
+Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
+
+jz4740-battery: Add missing kfree(jz_battery) in jz_battery_remove()
+
+Signed-off-by: Axel Lin <axel.lin@gmail.com>
+Acked-By: Lars-Peter Clausen <lars@metafoo.de>
+Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
+---
+ drivers/power/jz4740-battery.c |    8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
+
+--- a/drivers/power/jz4740-battery.c
++++ b/drivers/power/jz4740-battery.c
+@@ -47,6 +47,8 @@ struct jz_battery {
+ 
+ 	struct power_supply battery;
+ 	struct delayed_work work;
++
++	struct mutex lock;
+ };
+ 
+ static inline struct jz_battery *psy_to_jz_battery(struct power_supply *psy)
+@@ -68,6 +70,8 @@ static long jz_battery_read_voltage(stru
+ 	unsigned long val;
+ 	long voltage;
+ 
++	mutex_lock(&battery->lock);
++
+ 	INIT_COMPLETION(battery->read_completion);
+ 
+ 	enable_irq(battery->irq);
+@@ -91,6 +95,8 @@ static long jz_battery_read_voltage(stru
+ 	battery->cell->disable(battery->pdev);
+ 	disable_irq(battery->irq);
+ 
++	mutex_unlock(&battery->lock);
++
+ 	return voltage;
+ }
+ 
+@@ -291,6 +297,7 @@ static int __devinit jz_battery_probe(st
+ 	jz_battery->pdev = pdev;
+ 
+ 	init_completion(&jz_battery->read_completion);
++	mutex_init(&jz_battery->lock);
+ 
+ 	INIT_DELAYED_WORK(&jz_battery->work, jz_battery_work);
+ 
+@@ -383,6 +390,7 @@ static int __devexit jz_battery_remove(s
+ 
+ 	iounmap(jz_battery->base);
+ 	release_mem_region(jz_battery->mem->start, resource_size(jz_battery->mem));
++	kfree(jz_battery);
+ 
+ 	return 0;
+ }
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 000000000..173a0ee93
--- /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);