From: 黄涛 <huangtao@rock-chips.com>
Date: Sun, 10 Oct 2010 10:28:18 +0000 (+0800)
Subject: adckey: 增加名字板级自定义，允许厂商在Android中定义不同的键盘映射
X-Git-Tag: firefly_0821_release~11073
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e6edd33c47ab25c53101058b0ef206fc9e7756ad;p=firefly-linux-kernel-4.4.55.git

adckey: 增加名字板级自定义，允许厂商在Android中定义不同的键盘映射
---

diff --git a/arch/arm/mach-rk2818/board-raho.c b/arch/arm/mach-rk2818/board-raho.c
index e624460d8eb6..ced91f7df2b9 100755
--- a/arch/arm/mach-rk2818/board-raho.c
+++ b/arch/arm/mach-rk2818/board-raho.c
@@ -2051,7 +2051,7 @@ static unsigned char gInitKeyCode[] =
 	ENDCALL,KEYSTART,KEY_WAKEUP,
 };
 
-struct adc_key_data rk2818_adc_key = {
+static struct adc_key_data rk2818_adc_key = {
     .pin_playon     = PLAY_ON_PIN,
     .playon_level   = PLAY_ON_LEVEL,
     .adc_empty      = 1000,
@@ -2065,6 +2065,7 @@ struct adc_key_data rk2818_adc_key = {
 
 struct rk2818_adckey_platform_data rk2818_adckey_platdata = {
 	.adc_key = &rk2818_adc_key,
+	.name = "raho-keypad",
 };
 
 #if CONFIG_ANDROID_TIMED_GPIO
diff --git a/arch/arm/mach-rk2818/include/mach/board.h b/arch/arm/mach-rk2818/include/mach/board.h
index 6f9f9c4315f6..21d117d9614d 100755
--- a/arch/arm/mach-rk2818/include/mach/board.h
+++ b/arch/arm/mach-rk2818/include/mach/board.h
@@ -262,6 +262,7 @@ struct rk2818_adckey_platform_data {
 	int (*io_init)(void);
 	int (*io_deinit)(void);
 	struct adc_key_data *adc_key;
+	const char *name;
 };
 
 struct  jgball_data {
diff --git a/drivers/input/keyboard/rk2818_adckey.c b/drivers/input/keyboard/rk2818_adckey.c
index 686c892695b0..a7d613c5b932 100755
--- a/drivers/input/keyboard/rk2818_adckey.c
+++ b/drivers/input/keyboard/rk2818_adckey.c
@@ -279,7 +279,7 @@ static int __devinit rk28_adckey_probe(struct platform_device *pdev)
 		goto failed_free;
 	}
 
-	input_dev->name = pdev->name;
+	input_dev->name = pdata->name ? pdata->name : pdev->name;
 	//input_dev->id.bustype = BUS_HOST;
 	input_dev->open = rk28_adckey_open;
 	input_dev->close = rk28_adckey_close;