Enable iPod Nano 2G boosting (without undervolting for now)

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24721 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 9 insertions, 13 deletions

diff --git a/firmware/target/arm/s5l8700/ipodnano2g/pmu-nano2g.c b/firmware/target/arm/s5l8700/ipodnano2g/pmu-nano2g.c
index be026a8cf4..aea9b79b55 100644
--- a/firmware/target/arm/s5l8700/ipodnano2g/pmu-nano2g.c
+++ b/firmware/target/arm/s5l8700/ipodnano2g/pmu-nano2g.c
@@ -24,16 +24,15 @@
 #include "i2c-s5l8700.h"
 
 static struct mutex pmu_adc_mutex;
-int pmu_initialized = 0;
 
-void pmu_read_multiple(int address, int count, unsigned char* buffer)
+int pmu_read_multiple(int address, int count, unsigned char* buffer)
 {
-    i2c_read(0xe6, address, count, buffer);
+    return i2c_read(0xe6, address, count, buffer);
 }
 
-void pmu_write_multiple(int address, int count, unsigned char* buffer)
+int pmu_write_multiple(int address, int count, unsigned char* buffer)
 {
-    i2c_write(0xe6, address, count, buffer);
+    return i2c_write(0xe6, address, count, buffer);
 }
 
 unsigned char pmu_read(int address)
@@ -45,22 +44,19 @@ unsigned char pmu_read(int address)
     return tmp;
 }
 
-void pmu_write(int address, unsigned char val)
+int pmu_write(int address, unsigned char val)
 {
-    pmu_write_multiple(address, 1, &val);
+    return pmu_write_multiple(address, 1, &val);
 }
 
 void pmu_init(void)
 {
-    if (pmu_initialized) return;
     mutex_init(&pmu_adc_mutex);
-    pmu_initialized = 1;
 }
 
 int pmu_read_adc(unsigned int adc)
 {
     int data = 0;
-    if (!pmu_initialized) pmu_init();
     mutex_lock(&pmu_adc_mutex);
     pmu_write(0x54, 5 | (adc << 4));
     while ((data & 0x80) == 0)
diff --git a/firmware/target/arm/s5l8700/ipodnano2g/pmu-target.h b/firmware/target/arm/s5l8700/ipodnano2g/pmu-target.h
index 53f4dacc1b..40618c4447 100644
--- a/firmware/target/arm/s5l8700/ipodnano2g/pmu-target.h
+++ b/firmware/target/arm/s5l8700/ipodnano2g/pmu-target.h
@@ -25,9 +25,9 @@
 #include "config.h"
 
 unsigned char pmu_read(int address);
-void pmu_write(int address, unsigned char val);
-void pmu_read_multiple(int address, int count, unsigned char* buffer);
-void pmu_write_multiple(int address, int count, unsigned char* buffer);
+int pmu_write(int address, unsigned char val);
+int pmu_read_multiple(int address, int count, unsigned char* buffer);
+int pmu_write_multiple(int address, int count, unsigned char* buffer);
 int pmu_read_adc(unsigned int adc);
 int pmu_read_battery_voltage(void);
 int pmu_read_battery_current(void);