summaryrefslogtreecommitdiff
path: root/firmware/target/arm/ipod/1g2g
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/target/arm/ipod/1g2g')
-rw-r--r--firmware/target/arm/ipod/1g2g/adc-ipod-1g2g.c4
-rw-r--r--firmware/target/arm/ipod/1g2g/powermgmt-1g2g.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/firmware/target/arm/ipod/1g2g/adc-ipod-1g2g.c b/firmware/target/arm/ipod/1g2g/adc-ipod-1g2g.c
index 37c719f2b1..4a9fe2e568 100644
--- a/firmware/target/arm/ipod/1g2g/adc-ipod-1g2g.c
+++ b/firmware/target/arm/ipod/1g2g/adc-ipod-1g2g.c
@@ -40,7 +40,7 @@ unsigned short adc_scan(int channel)
40 (void)channel; /* there is only one */ 40 (void)channel; /* there is only one */
41 mutex_lock(&adc_mtx); 41 mutex_lock(&adc_mtx);
42 42
43 if ((IPOD_HW_REVISION >> 16) == 1) 43 if ((IPOD_HW_REVISION >> 16) != 2)
44 { 44 {
45 int i; 45 int i;
46 unsigned pval = GPIOB_OUTPUT_VAL; 46 unsigned pval = GPIOB_OUTPUT_VAL;
@@ -109,7 +109,7 @@ void adc_init(void)
109 109
110 GPIOB_ENABLE |= 0x1e; /* enable B1..B4 */ 110 GPIOB_ENABLE |= 0x1e; /* enable B1..B4 */
111 111
112 if ((IPOD_HW_REVISION >> 16) == 1) 112 if ((IPOD_HW_REVISION >> 16) != 2)
113 { 113 {
114 GPIOB_OUTPUT_EN = (GPIOB_OUTPUT_EN & ~0x08) | 0x16; 114 GPIOB_OUTPUT_EN = (GPIOB_OUTPUT_EN & ~0x08) | 0x16;
115 /* B1, B2, B4 -> output, B3 -> input */ 115 /* B1, B2, B4 -> output, B3 -> input */
diff --git a/firmware/target/arm/ipod/1g2g/powermgmt-1g2g.c b/firmware/target/arm/ipod/1g2g/powermgmt-1g2g.c
index c3eca14332..b90b953c68 100644
--- a/firmware/target/arm/ipod/1g2g/powermgmt-1g2g.c
+++ b/firmware/target/arm/ipod/1g2g/powermgmt-1g2g.c
@@ -61,7 +61,7 @@ int _battery_voltage(void)
61{ 61{
62 unsigned adcval = adc_read(ADC_UNREG_POWER); 62 unsigned adcval = adc_read(ADC_UNREG_POWER);
63 63
64 if ((IPOD_HW_REVISION >> 16) == 1) 64 if ((IPOD_HW_REVISION >> 16) != 2)
65 return (adcval * BATTERY_SCALE_FACTOR_1G) >> 8; 65 return (adcval * BATTERY_SCALE_FACTOR_1G) >> 8;
66 else 66 else
67 return (adcval * BATTERY_SCALE_FACTOR_2G) >> 8; 67 return (adcval * BATTERY_SCALE_FACTOR_2G) >> 8;