rk29_keys: rename to rk29-keypad

diff --git a/arch/arm/mach-rk29/board-rk29sdk-key.c b/arch/arm/mach-rk29/board-rk29sdk-key.c
index 805a0551a2c36b3b6821de52fb87f801a7f9464d..6f3af7fb9446915ed2198ba6666289b066ea5a36 100755 (executable)
--- a/arch/arm/mach-rk29/board-rk29sdk-key.c
+++ b/arch/arm/mach-rk29/board-rk29sdk-key.c
@@ -34,26 +34,25 @@ static struct rk29_keys_button key_button[] = {
        },\r
        {\r
                .desc   = "search",\r
-               .code   = KEY_RESERVED, //report what???\r
+               .code   = KEY_SEARCH,\r
                .gpio   = RK29_PIN6_PA4,\r
                .active_low = PRESS_LEV_LOW,\r
        },\r
        {\r
                .desc   = "esc",\r
-               .code   = KEY_ESC,\r
+               .code   = KEY_BACK,\r
                .gpio   = RK29_PIN6_PA5,\r
                .active_low = PRESS_LEV_LOW,\r
        },\r
        {\r
                .desc   = "sensor",\r
-               .code   = KEY_RESERVED, //report what???\r
+               .code   = KEY_CAMERA,\r
                .gpio   = RK29_PIN6_PA6,\r
                .active_low = PRESS_LEV_LOW,\r
        },\r
        {\r
                .desc   = "play",\r
-               .code   = KEY_BACK,\r
-               .code_long_press = EV_ENCALL,\r
+               .code   = KEY_POWER,\r
                .gpio   = RK29_PIN6_PA7,\r
                .active_low = PRESS_LEV_LOW,\r
        },\r

diff --git a/arch/arm/mach-rk29/board-rk29sdk.c b/arch/arm/mach-rk29/board-rk29sdk.c
index d7cd239e042ca20f7a0bd6a3dea01b3e156630bd..df33a62d0b86b58104d8ac0c7cf7fc69af3f27ad 100755 (executable)
--- a/arch/arm/mach-rk29/board-rk29sdk.c
+++ b/arch/arm/mach-rk29/board-rk29sdk.c
@@ -793,7 +793,7 @@ struct platform_device rk29_device_gpu = {
 #ifdef CONFIG_KEYS_RK29\r
 extern struct rk29_keys_platform_data rk29_keys_pdata;\r
 static struct platform_device rk29_device_keys = {\r
-       .name           = "rk29-keys",\r
+       .name           = "rk29-keypad",\r
        .id             = -1,\r
        .dev            = {\r
                .platform_data  = &rk29_keys_pdata,\r

diff --git a/drivers/input/keyboard/rk29_keys.c b/drivers/input/keyboard/rk29_keys.c
index 17cadafde0b64bec4f38730bc339273984c18b59..37f0bb805a2a7fcb1821352bbc1525617640ab22 100755 (executable)
--- a/drivers/input/keyboard/rk29_keys.c
+++ b/drivers/input/keyboard/rk29_keys.c
@@ -397,7 +397,7 @@ static struct platform_driver keys_device_driver = {
        .probe          = keys_probe,
        .remove         = __devexit_p(keys_remove),
        .driver         = {
-               .name   = "rk29-keys",
+               .name   = "rk29-keypad",
                .owner  = THIS_MODULE,
 #ifdef CONFIG_PM
                .pm     = &keys_pm_ops,