Merge with 5653c3aa411a13f9d9eba43f93f34e33d5dd9a31

diff --git a/arch/ppc/mpc55xx/drivers/Adc_560x.c b/arch/ppc/mpc55xx/drivers/Adc_560x.c
index 4a28f91bf4e4c3eb79cfc0b339d409f061a3b036..42ed7d6e338bf19c52122ced9a57724e8dae393a 100644 (file)
--- a/arch/ppc/mpc55xx/drivers/Adc_560x.c
+++ b/arch/ppc/mpc55xx/drivers/Adc_560x.c
@@ -59,8 +59,14 @@
 #define        ADC1_WD_INT             ADC_B_WD\r
 #endif\r
 \r
+#if defined(CFG_MPC5668)\r
+#define ADC_BASE_ADDRESS 0xFFF80000\r
+#else\r
+#define ADC_BASE_ADDRESS 0xFFE00000\r
+#endif\r
+\r
 #define GET_HW_CONTROLLER(_controller)         \\r
-                                               ((struct ADC_tag *)(0xFFE00000 + 0x4000*(_controller)))\r
+                                               ((struct ADC_tag *)(ADC_BASE_ADDRESS + 0x4000*(_controller)))\r
 \r
 #define GET_HWUNITID_FROM_GROUP(_group) (_group / ADC_NOF_GROUP_PER_CONTROLLER)\r
 \r