rk3066b: m701: remove board-rk3066b-m701-key.c

diff --git a/arch/arm/mach-rk30/board-rk3066b-m701-key.c b/arch/arm/mach-rk30/board-rk3066b-m701-key.c
deleted file mode 100644 (file)
index d9b47e4..0000000
--- a/arch/arm/mach-rk30/board-rk3066b-m701-key.c
+++ /dev/null
@@ -1,37 +0,0 @@
-#include <mach/gpio.h>
-#include <plat/key.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[] = {
-       {
-               .desc   = "vol-",
-               .code   = KEY_VOLUMEDOWN,
-               .gpio = RK30_PIN0_PB5,
-               .active_low = PRESS_LEV_LOW,
-       },
-       {
-               .desc   = "play",
-               .code   = KEY_POWER,
-               .gpio   = RK30_PIN0_PA4, 
-               .active_low = PRESS_LEV_LOW,
-               .wakeup = 1,
-       },
-       {
-               .desc   = "vol+",
-               .code   = KEY_VOLUMEUP,
-               .adc_value      = 1,
-               .gpio = INVALID_GPIO,
-               .active_low = PRESS_LEV_LOW,
-       },
-};
-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-rk30/board-rk3066b-m701.c b/arch/arm/mach-rk30/board-rk3066b-m701.c
index a07470feb28be7b502e5a386aad08ae60bbe273f..21362549a3ba0078373b5d9acf33bbff3b640011 100755 (executable)
--- a/arch/arm/mach-rk30/board-rk3066b-m701.c
+++ b/arch/arm/mach-rk30/board-rk3066b-m701.c
@@ -81,7 +81,36 @@
 #endif
 
 #include "board-rk3066b-m701-camera.c"
-#include "board-rk3066b-m701-key.c"
+
+#include <plat/key.h>
+static struct rk29_keys_button key_button[] = {
+       {
+               .desc   = "vol-",
+               .code   = KEY_VOLUMEDOWN,
+               .gpio = RK30_PIN0_PB5,
+               .active_low = PRESS_LEV_LOW,
+       },
+       {
+               .desc   = "play",
+               .code   = KEY_POWER,
+               .gpio   = RK30_PIN0_PA4,
+               .active_low = PRESS_LEV_LOW,
+               .wakeup = 1,
+       },
+       {
+               .desc   = "vol+",
+               .code   = KEY_VOLUMEUP,
+               .adc_value      = 1,
+               .gpio = INVALID_GPIO,
+               .active_low = PRESS_LEV_LOW,
+       },
+};
+
+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
+};
 
 #if defined(CONFIG_TOUCHSCREEN_GT8XX)
 #define TOUCH_RESET_PIN  RK30_PIN2_PC0