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

diff --git a/arch/arm/mach-rk29/Makefile b/arch/arm/mach-rk29/Makefile
index 486c4533338ae67a5324874b2801852009b656fb..df59ba3d11af562f73bfca27cd8867d5af813ca9 100644 (file)
--- 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 (executable)
index 0000000..fcf7679
--- /dev/null
+++ b/arch/arm/mach-rk29/board-rk29sdk-key.c
@@ -0,0 +1,93 @@
+#include <mach/key.h>\r
+#include <mach/gpio.h>\r
+\r
+#define EV_ENCALL                              KEY_F4\r
+#define EV_MENU                                        KEY_F1\r
+\r
+#define PRESS_LEV_LOW                  1\r
+#define PRESS_LEV_HIGH                 0\r
+\r
+static struct rk29_keys_button key_button[] = {\r
+       [0] = {\r
+               .desc   = "vol+",\r
+               .code   = KEY_VOLUMEDOWN,\r
+               .gpio   = RK29_PIN0_PB0,\r
+               .active_low = PRESS_LEV_LOW,\r
+       },\r
+       [1] = {\r
+               .desc   = "vol-",\r
+               .code   = KEY_VOLUMEUP,\r
+               .gpio   = RK29_PIN0_PB1,\r
+               .active_low = PRESS_LEV_LOW,\r
+       },\r
+       [2] = {\r
+               .desc   = "menu",\r
+               .code   = EV_MENU,\r
+               .gpio   = RK29_PIN0_PB2,\r
+               .active_low = PRESS_LEV_LOW,\r
+       },\r
+       [3] = {\r
+               .desc   = "home",\r
+               .code   = KEY_HOME,\r
+               .code_long_press = KEY_F4,\r
+               .gpio   = RK29_PIN0_PB3,\r
+               .active_low = PRESS_LEV_LOW,\r
+       },\r
+       [4] = {\r
+               .desc   = "back",\r
+               .code   = KEY_BACK,\r
+               .gpio   = RK29_PIN0_PB4,\r
+               .active_low = PRESS_LEV_LOW,\r
+       },\r
+       [5] = {\r
+               .desc   = "esc",\r
+               .code   = KEY_ESC,\r
+               .gpio   = RK29_PIN0_PB5,\r
+               .active_low = PRESS_LEV_LOW,\r
+       },\r
+#if 0\r
+       [6] = {\r
+               .desc   = "vol+",\r
+               .code   = KEY_VOLUMEDOWN,\r
+               .adc_value      = 95,\r
+               .active_low = PRESS_LEV_LOW,\r
+       },\r
+       [7] = {\r
+               .desc   = "vol-",\r
+               .code   = KEY_VOLUMEUP,\r
+               .adc_value      = 249,\r
+               .active_low = PRESS_LEV_LOW,\r
+       },\r
+       [8] = {\r
+               .desc   = "menu",\r
+               .code   = EV_MENU,\r
+               .adc_value      = 406,\r
+               .active_low = PRESS_LEV_LOW,\r
+       },\r
+       [9] = {\r
+               .desc   = "home",\r
+               .code   = KEY_HOME,\r
+               .code_long_press = KEY_F4,\r
+               .adc_value      = 561,\r
+               .active_low = PRESS_LEV_LOW,\r
+       },\r
+       [10] = {\r
+               .desc   = "back",\r
+               .code   = KEY_BACK,\r
+               .adc_value      = 726,\r
+               .active_low = PRESS_LEV_LOW,\r
+       },\r
+       [11] = {\r
+               .desc   = "esc",\r
+               .code   = KEY_ESC,\r
+               .adc_value      = 899,\r
+               .active_low = PRESS_LEV_LOW,\r
+       },\r
+#endif\r
+};\r
+struct rk29_keys_platform_data rk29_keys_pdata = {\r
+       .buttons        = key_button,\r
+       .nbuttons       = ARRAY_SIZE(key_button),\r
+       .chn    = -1,  //chn: 0-7, if do not use ADC,set 'chn' -1\r
+};\r
+\r

diff --git a/arch/arm/mach-rk29/key.c b/arch/arm/mach-rk29/key.c
deleted file mode 100755 (executable)
index 8afc28f..0000000
--- a/arch/arm/mach-rk29/key.c
+++ /dev/null
@@ -1,95 +0,0 @@
-#include <mach/key.h>\r
-#include <mach/gpio.h>\r
-\r
-#define EV_ENCALL                              KEY_F4\r
-#define EV_MENU                                        KEY_F1\r
-\r
-#define PRESS_LEV_LOW                  1\r
-#define PRESS_LEV_HIGH                 0\r
-\r
-static struct rk29_keys_button key_button[] = {\r
-#ifdef CONFIG_MACH_RK29SDK\r
-       [0] = {\r
-               .desc   = "vol+",\r
-               .code   = KEY_VOLUMEDOWN,\r
-               .gpio   = RK29_PIN0_PB0,\r
-               .active_low = PRESS_LEV_LOW,\r
-       },\r
-       [1] = {\r
-               .desc   = "vol-",\r
-               .code   = KEY_VOLUMEUP,\r
-               .gpio   = RK29_PIN0_PB1,\r
-               .active_low = PRESS_LEV_LOW,\r
-       },\r
-       [2] = {\r
-               .desc   = "menu",\r
-               .code   = EV_MENU,\r
-               .gpio   = RK29_PIN0_PB2,\r
-               .active_low = PRESS_LEV_LOW,\r
-       },\r
-       [3] = {\r
-               .desc   = "home",\r
-               .code   = KEY_HOME,\r
-               .code_long_press = KEY_F4,\r
-               .gpio   = RK29_PIN0_PB3,\r
-               .active_low = PRESS_LEV_LOW,\r
-       },\r
-       [4] = {\r
-               .desc   = "back",\r
-               .code   = KEY_BACK,\r
-               .gpio   = RK29_PIN0_PB4,\r
-               .active_low = PRESS_LEV_LOW,\r
-       },\r
-       [5] = {\r
-               .desc   = "esc",\r
-               .code   = KEY_ESC,\r
-               .gpio   = RK29_PIN0_PB5,\r
-               .active_low = PRESS_LEV_LOW,\r
-       },\r
-#if 0\r
-       [6] = {\r
-               .desc   = "vol+",\r
-               .code   = KEY_VOLUMEDOWN,\r
-               .adc_value      = 95,\r
-               .active_low = PRESS_LEV_LOW,\r
-       },\r
-       [7] = {\r
-               .desc   = "vol-",\r
-               .code   = KEY_VOLUMEUP,\r
-               .adc_value      = 249,\r
-               .active_low = PRESS_LEV_LOW,\r
-       },\r
-       [8] = {\r
-               .desc   = "menu",\r
-               .code   = EV_MENU,\r
-               .adc_value      = 406,\r
-               .active_low = PRESS_LEV_LOW,\r
-       },\r
-       [9] = {\r
-               .desc   = "home",\r
-               .code   = KEY_HOME,\r
-               .code_long_press = KEY_F4,\r
-               .adc_value      = 561,\r
-               .active_low = PRESS_LEV_LOW,\r
-       },\r
-       [10] = {\r
-               .desc   = "back",\r
-               .code   = KEY_BACK,\r
-               .adc_value      = 726,\r
-               .active_low = PRESS_LEV_LOW,\r
-       },\r
-       [11] = {\r
-               .desc   = "esc",\r
-               .code   = KEY_ESC,\r
-               .adc_value      = 899,\r
-               .active_low = PRESS_LEV_LOW,\r
-       },\r
-#endif\r
-#endif\r
-};\r
-struct rk29_keys_platform_data rk29_keys_pdata = {\r
-       .buttons        = key_button,\r
-       .nbuttons       = ARRAY_SIZE(key_button),\r
-       .chn    = -1,  //chn: 0-7, if do not use ADC,set 'chn' -1\r
-};\r
-\r