From: 黄涛 <huangtao@rock-chips.com>
Date: Wed, 18 Jan 2012 06:25:45 +0000 (+0800)
Subject: fix wrong commit 1852a72
X-Git-Tag: firefly_0821_release~9661
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=121fb4892d70d8db728bb0ecf31d4371b2961d07;p=firefly-linux-kernel-4.4.55.git

fix wrong commit 1852a72
---

diff --git a/arch/arm/mach-rk29/board-rk29-k97.c b/arch/arm/mach-rk29/board-rk29-k97.c
index 2937b45d9654..213e3b3b2a87 100755
--- a/arch/arm/mach-rk29/board-rk29-k97.c
+++ b/arch/arm/mach-rk29/board-rk29-k97.c
@@ -416,40 +416,6 @@ 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)
@@ -1107,7 +1073,7 @@ struct bq27510_platform_data bq27510_info = {
 #endif
 
 #ifdef CONFIG_BATTERY_RK29_ADC
-struct rk29_adc_battery_platform_data rk29_adc_battery_platdata = {
+static struct rk29_adc_battery_platform_data rk29_adc_battery_platdata = {
 	.dc_det_pin      = RK29_PIN4_PA1,
 	.batt_low_pin    = RK29_PIN4_PA2,
 	.charge_set_pin  = INVALID_GPIO,
@@ -1116,6 +1082,14 @@ struct rk29_adc_battery_platform_data rk29_adc_battery_platdata = {
 	.dc_det_level    = GPIO_LOW,
 	.charge_ok_level = GPIO_HIGH,
 };
+
+static struct platform_device rk29_adc_device_battery = {
+	.name   = "rk2918-battery",
+	.id     = -1,
+	.dev = {
+		.platform_data = &rk29_adc_battery_platdata,
+	},
+};
 #endif
 
 /*************************************PMU ACT8891****************************************/
diff --git a/arch/arm/mach-rk29/devices.c b/arch/arm/mach-rk29/devices.c
old mode 100755
new mode 100644
index 63455a95d99b..125b3f97f9bd
--- a/arch/arm/mach-rk29/devices.c
+++ b/arch/arm/mach-rk29/devices.c
@@ -30,6 +30,27 @@
 #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_RK29_VMAC
 static u64 eth_dmamask = DMA_BIT_MASK(32);
diff --git a/arch/arm/mach-rk29/devices.h b/arch/arm/mach-rk29/devices.h
old mode 100755
new mode 100644
index c0b1d631b915..1a3eefa72ebb
--- a/arch/arm/mach-rk29/devices.h
+++ b/arch/arm/mach-rk29/devices.h
@@ -63,8 +63,6 @@ extern struct rk29_sdmmc_platform_data default_sdmmc1_data;
 extern struct platform_device rk29_device_sdmmc0;
 extern struct platform_device rk29_device_sdmmc1;
 extern struct platform_device rk29_device_adc;
-extern struct platform_device rk29_adc_device_battery;
-extern struct rk29_adc_battery_platform_data rk29_adc_battery_platdata;
 extern struct platform_device rk29_device_vmac;
 extern struct rk29_bl_info    rk29_bl_info;
 extern struct rk29_button_light_info rk29_button_light_info;