move adc battery platform data from devices.c to board-rk29-k97.c

diff --git a/arch/arm/mach-rk29/board-rk29-k97.c b/arch/arm/mach-rk29/board-rk29-k97.c
index e2dcf36f2f5efc903ad1b5d633c9446793f400a7..2937b45d9654ace0b43dd617ec4752e1c1079e59 100755 (executable)
--- a/arch/arm/mach-rk29/board-rk29-k97.c
+++ b/arch/arm/mach-rk29/board-rk29-k97.c
@@ -416,6 +416,40 @@ struct platform_device rk29_device_dma_cpy = {
 };
 
 #endif
+#ifdef CONFIG_ADC_RK29
+static struct resource rk29_adc_resource[] = {
+        {
+                .start = IRQ_SARADC,
+                .end   = IRQ_SARADC,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
+                .start = RK29_ADC_PHYS,
+                .end   = RK29_ADC_PHYS + RK29_ADC_SIZE - 1,
+                .flags = IORESOURCE_MEM,
+        },
+
+};
+
+struct platform_device rk29_device_adc = {
+        .name             = "rk29-adc",
+        .id               = -1,
+        .num_resources    = ARRAY_SIZE(rk29_adc_resource),
+        .resource         = rk29_adc_resource,
+};
+
+#endif
+
+#ifdef CONFIG_BATTERY_RK29_ADC
+struct platform_device rk29_adc_device_battery = {
+                .name   = "rk2918-battery",
+                .id     = -1,
+                .dev = {
+                        .platform_data = &rk29_adc_battery_platdata,
+                },
+};
+#endif
+
 
 #if defined(CONFIG_RK29_GPIO_SUSPEND)
 static void key_gpio_pullupdown_enable(void)

diff --git a/arch/arm/mach-rk29/devices.c b/arch/arm/mach-rk29/devices.c
index cc8f3371ee7f369ae8b31a625f10beaf1a22c34d..63455a95d99b994880055fa3c15d0b98772cb7fc 100755 (executable)
--- a/arch/arm/mach-rk29/devices.c
+++ b/arch/arm/mach-rk29/devices.c
@@ -29,39 +29,8 @@
 #include <mach/board.h>
 #include <mach/loader.h>
 #include "devices.h"
-#ifdef CONFIG_ADC_RK29
-static struct resource rk29_adc_resource[] = {
-       {
-               .start = IRQ_SARADC,
-               .end   = IRQ_SARADC,
-               .flags = IORESOURCE_IRQ,
-       },
-       {
-               .start = RK29_ADC_PHYS,
-               .end   = RK29_ADC_PHYS + RK29_ADC_SIZE - 1,
-               .flags = IORESOURCE_MEM,
-       },
-
-};
 
-struct platform_device rk29_device_adc = {
-       .name             = "rk29-adc",
-       .id               = -1,
-       .num_resources    = ARRAY_SIZE(rk29_adc_resource),
-       .resource         = rk29_adc_resource,
-};
-
-#endif
 
-#ifdef CONFIG_BATTERY_RK29_ADC
-struct platform_device rk29_adc_device_battery = {
-               .name   = "rk2918-battery",
-               .id     = -1,
-               .dev = {
-                       .platform_data = &rk29_adc_battery_platdata,
-               },
-};
-#endif
 #ifdef CONFIG_RK29_VMAC
 static u64 eth_dmamask = DMA_BIT_MASK(32);
 static struct resource rk29_vmac_resource[] = {