From: kfx <kfx@rock-chips.com>
Date: Thu, 18 Nov 2010 12:07:05 +0000 (+0800)
Subject: key.c --> board-rk29sdk-key.c
X-Git-Tag: firefly_0821_release~11016^2~17
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=0a0fed051283cf3598a6c1948b5c39b8f831ea5b;p=firefly-linux-kernel-4.4.55.git

key.c --> board-rk29sdk-key.c
---

diff --git a/arch/arm/mach-rk29/Makefile b/arch/arm/mach-rk29/Makefile
index 486c4533338a..df59ba3d11af 100644
--- a/arch/arm/mach-rk29/Makefile
+++ b/arch/arm/mach-rk29/Makefile
@@ -1,3 +1,3 @@
-obj-y += timer.o io.o devices.o iomux.o clock.o rk29-pl330.o dma.o gpio.o key.o
+obj-y += timer.o io.o devices.o iomux.o clock.o rk29-pl330.o dma.o gpio.o
 obj-$(CONFIG_RK29_VPU) += vpu.o
-obj-$(CONFIG_MACH_RK29SDK) += board-rk29sdk.o
+obj-$(CONFIG_MACH_RK29SDK) += board-rk29sdk.o board-rk29sdk-key.o
diff --git a/arch/arm/mach-rk29/board-rk29sdk-key.c b/arch/arm/mach-rk29/board-rk29sdk-key.c
new file mode 100755
index 000000000000..fcf767927e30
--- /dev/null
+++ b/arch/arm/mach-rk29/board-rk29sdk-key.c
@@ -0,0 +1,93 @@
+#include <mach/key.h>
+#include <mach/gpio.h>
+
+#define EV_ENCALL				KEY_F4
+#define EV_MENU					KEY_F1
+
+#define PRESS_LEV_LOW			1
+#define PRESS_LEV_HIGH			0
+
+static struct rk29_keys_button key_button[] = {
+	[0] = {
+		.desc	= "vol+",
+		.code	= KEY_VOLUMEDOWN,
+		.gpio	= RK29_PIN0_PB0,
+		.active_low = PRESS_LEV_LOW,
+	},
+	[1] = {
+		.desc	= "vol-",
+		.code	= KEY_VOLUMEUP,
+		.gpio	= RK29_PIN0_PB1,
+		.active_low = PRESS_LEV_LOW,
+	},
+	[2] = {
+		.desc	= "menu",
+		.code	= EV_MENU,
+		.gpio	= RK29_PIN0_PB2,
+		.active_low = PRESS_LEV_LOW,
+	},
+	[3] = {
+		.desc	= "home",
+		.code	= KEY_HOME,
+		.code_long_press = KEY_F4,
+		.gpio	= RK29_PIN0_PB3,
+		.active_low = PRESS_LEV_LOW,
+	},
+	[4] = {
+		.desc	= "back",
+		.code	= KEY_BACK,
+		.gpio	= RK29_PIN0_PB4,
+		.active_low = PRESS_LEV_LOW,
+	},
+	[5] = {
+		.desc	= "esc",
+		.code	= KEY_ESC,
+		.gpio	= RK29_PIN0_PB5,
+		.active_low = PRESS_LEV_LOW,
+	},
+#if 0
+	[6] = {
+		.desc	= "vol+",
+		.code	= KEY_VOLUMEDOWN,
+		.adc_value	= 95,
+		.active_low = PRESS_LEV_LOW,
+	},
+	[7] = {
+		.desc	= "vol-",
+		.code	= KEY_VOLUMEUP,
+		.adc_value	= 249,
+		.active_low = PRESS_LEV_LOW,
+	},
+	[8] = {
+		.desc	= "menu",
+		.code	= EV_MENU,
+		.adc_value	= 406,
+		.active_low = PRESS_LEV_LOW,
+	},
+	[9] = {
+		.desc	= "home",
+		.code	= KEY_HOME,
+		.code_long_press = KEY_F4,
+		.adc_value	= 561,
+		.active_low = PRESS_LEV_LOW,
+	},
+	[10] = {
+		.desc	= "back",
+		.code	= KEY_BACK,
+		.adc_value	= 726,
+		.active_low = PRESS_LEV_LOW,
+	},
+	[11] = {
+		.desc	= "esc",
+		.code	= KEY_ESC,
+		.adc_value	= 899,
+		.active_low = PRESS_LEV_LOW,
+	},
+#endif
+};
+struct rk29_keys_platform_data rk29_keys_pdata = {
+	.buttons	= key_button,
+	.nbuttons	= ARRAY_SIZE(key_button),
+	.chn	= -1,  //chn: 0-7, if do not use ADC,set 'chn' -1
+};
+
diff --git a/arch/arm/mach-rk29/key.c b/arch/arm/mach-rk29/key.c
deleted file mode 100755
index 8afc28f0d92b..000000000000
--- a/arch/arm/mach-rk29/key.c
+++ /dev/null
@@ -1,95 +0,0 @@
-#include <mach/key.h>
-#include <mach/gpio.h>
-
-#define EV_ENCALL				KEY_F4
-#define EV_MENU					KEY_F1
-
-#define PRESS_LEV_LOW			1
-#define PRESS_LEV_HIGH			0
-
-static struct rk29_keys_button key_button[] = {
-#ifdef CONFIG_MACH_RK29SDK
-	[0] = {
-		.desc	= "vol+",
-		.code	= KEY_VOLUMEDOWN,
-		.gpio	= RK29_PIN0_PB0,
-		.active_low = PRESS_LEV_LOW,
-	},
-	[1] = {
-		.desc	= "vol-",
-		.code	= KEY_VOLUMEUP,
-		.gpio	= RK29_PIN0_PB1,
-		.active_low = PRESS_LEV_LOW,
-	},
-	[2] = {
-		.desc	= "menu",
-		.code	= EV_MENU,
-		.gpio	= RK29_PIN0_PB2,
-		.active_low = PRESS_LEV_LOW,
-	},
-	[3] = {
-		.desc	= "home",
-		.code	= KEY_HOME,
-		.code_long_press = KEY_F4,
-		.gpio	= RK29_PIN0_PB3,
-		.active_low = PRESS_LEV_LOW,
-	},
-	[4] = {
-		.desc	= "back",
-		.code	= KEY_BACK,
-		.gpio	= RK29_PIN0_PB4,
-		.active_low = PRESS_LEV_LOW,
-	},
-	[5] = {
-		.desc	= "esc",
-		.code	= KEY_ESC,
-		.gpio	= RK29_PIN0_PB5,
-		.active_low = PRESS_LEV_LOW,
-	},
-#if 0
-	[6] = {
-		.desc	= "vol+",
-		.code	= KEY_VOLUMEDOWN,
-		.adc_value	= 95,
-		.active_low = PRESS_LEV_LOW,
-	},
-	[7] = {
-		.desc	= "vol-",
-		.code	= KEY_VOLUMEUP,
-		.adc_value	= 249,
-		.active_low = PRESS_LEV_LOW,
-	},
-	[8] = {
-		.desc	= "menu",
-		.code	= EV_MENU,
-		.adc_value	= 406,
-		.active_low = PRESS_LEV_LOW,
-	},
-	[9] = {
-		.desc	= "home",
-		.code	= KEY_HOME,
-		.code_long_press = KEY_F4,
-		.adc_value	= 561,
-		.active_low = PRESS_LEV_LOW,
-	},
-	[10] = {
-		.desc	= "back",
-		.code	= KEY_BACK,
-		.adc_value	= 726,
-		.active_low = PRESS_LEV_LOW,
-	},
-	[11] = {
-		.desc	= "esc",
-		.code	= KEY_ESC,
-		.adc_value	= 899,
-		.active_low = PRESS_LEV_LOW,
-	},
-#endif
-#endif
-};
-struct rk29_keys_platform_data rk29_keys_pdata = {
-	.buttons	= key_button,
-	.nbuttons	= ARRAY_SIZE(key_button),
-	.chn	= -1,  //chn: 0-7, if do not use ADC,set 'chn' -1
-};
-