2 files changed, 21 insertions, 3 deletions

diff --git a/firmware/target/arm/adc-pp5020.c b/firmware/target/arm/adc-pp5020.c
index e270a41235..851e907246 100644
--- a/firmware/target/arm/adc-pp5020.c
+++ b/firmware/target/arm/adc-pp5020.c
@@ -39,6 +39,9 @@ unsigned short adc_scan(int channel)
     unsigned int adc_data_1;
     unsigned int adc_data_2;
 
+    if (channel >= NUM_ADC_CHANNELS)
+        return 0;
+
     /* Start conversion */
     ADC_ADDR |= 0x80000000;
 
@@ -56,12 +59,14 @@ unsigned short adc_scan(int channel)
 
     adcdata[channel] = (adc_data_1<<2 | adc_data_2);
 
+#if !defined(PHILIPS_HDD1630)
     /* ADC values read low if PLL is enabled */
     if(PLL_CONTROL & 0x80000000){
         adcdata[channel] += 0x14;
         if(adcdata[channel] > 0x400)
             adcdata[channel] = 0x400;
     }
+#endif
 
     return adcdata[channel];
 }
@@ -89,9 +94,12 @@ static void adc_tick(void)
 /* Figured out from how the OF does things */
 void adc_init(void)
 {
-
+#if defined(PHILIPS_HDD1630)
+    ADC_INIT = 0;
+#else
     ADC_INIT |= 1;
     ADC_INIT |= 0x40000000;
+#endif
     udelay(100);
 
     /* Reset ADC */
@@ -108,13 +116,17 @@ void adc_init(void)
     ADC_CLOCK_SRC |= 0x3;
     udelay(100);
 
+    ADC_ADDR = 0;
     ADC_ADDR |= 0x40;
+
+#if !defined(PHILIPS_HDD1630)
     ADC_ADDR |= 0x20000000;
     udelay(100);
 
     ADC_INIT;
     ADC_INIT = 0;
     udelay(100);
+#endif
 
     ADC_STATUS = 0;
 
@@ -129,7 +141,7 @@ void adc_init(void)
     ADC_STATUS |= 0x2000;
 
 #if defined (IRIVER_H10) || defined(IRIVER_H10_5GB) || \
-    defined(MROBE_100) || defined(PHILIPS_HDD1630)
+    defined(MROBE_100)
     /* Enable channel 2 (H10:remote) */
     DEV_INIT1  &=~0x300;
     DEV_INIT1  |= 0x100;
@@ -143,6 +155,12 @@ void adc_init(void)
     ADC_STATUS |= 0x20000000;
 #endif
 
+#if defined(PHILIPS_HDD1630)
+    ADC_INIT |= 0x80000000;
+    udelay(100);
+    ADC_INIT = 0;
+#endif
+
     /* Force a scan of all channels to get initial values */
     adc_scan(0);
     adc_scan(1);
diff --git a/firmware/target/arm/philips/hdd1630/adc-target.h b/firmware/target/arm/philips/hdd1630/adc-target.h
index ee9e294c6b..bf97081e35 100644
--- a/firmware/target/arm/philips/hdd1630/adc-target.h
+++ b/firmware/target/arm/philips/hdd1630/adc-target.h
@@ -21,7 +21,7 @@
 #ifndef _ADC_TARGET_H_
 #define _ADC_TARGET_H_
 
-#define NUM_ADC_CHANNELS 4
+#define NUM_ADC_CHANNELS 2
 
 #define ADC_BATTERY     0
 #define ADC_UNKNOWN_1   1