From: 黄涛 <huangtao@rock-chips.com>
Date: Mon, 6 Dec 2010 11:01:57 +0000 (+0800)
Subject: rk29_keys: rename to rk29-keypad
X-Git-Tag: firefly_0821_release~10985^2~9
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1f365e6f94f46412b435be0d7e9b0b069271cbe7;p=firefly-linux-kernel-4.4.55.git

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 805a0551a2c3..6f3af7fb9446 100755
--- 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[] = {
 	},
 	{
 		.desc	= "search",
-		.code	= KEY_RESERVED, //report what???
+		.code	= KEY_SEARCH,
 		.gpio	= RK29_PIN6_PA4,
 		.active_low = PRESS_LEV_LOW,
 	},
 	{
 		.desc	= "esc",
-		.code	= KEY_ESC,
+		.code	= KEY_BACK,
 		.gpio	= RK29_PIN6_PA5,
 		.active_low = PRESS_LEV_LOW,
 	},
 	{
 		.desc	= "sensor",
-		.code	= KEY_RESERVED, //report what???
+		.code	= KEY_CAMERA,
 		.gpio	= RK29_PIN6_PA6,
 		.active_low = PRESS_LEV_LOW,
 	},
 	{
 		.desc	= "play",
-		.code	= KEY_BACK,
-		.code_long_press = EV_ENCALL,
+		.code	= KEY_POWER,
 		.gpio	= RK29_PIN6_PA7,
 		.active_low = PRESS_LEV_LOW,
 	},
diff --git a/arch/arm/mach-rk29/board-rk29sdk.c b/arch/arm/mach-rk29/board-rk29sdk.c
index d7cd239e042c..df33a62d0b86 100755
--- 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
 extern struct rk29_keys_platform_data rk29_keys_pdata;
 static struct platform_device rk29_device_keys = {
-	.name		= "rk29-keys",
+	.name		= "rk29-keypad",
 	.id		= -1,
 	.dev		= {
 		.platform_data	= &rk29_keys_pdata,
diff --git a/drivers/input/keyboard/rk29_keys.c b/drivers/input/keyboard/rk29_keys.c
index 17cadafde0b6..37f0bb805a2a 100755
--- 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,