From e6edd33c47ab25c53101058b0ef206fc9e7756ad Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E9=BB=84=E6=B6=9B?= Date: Sun, 10 Oct 2010 18:28:18 +0800 Subject: [PATCH] =?utf8?q?adckey:=20=E5=A2=9E=E5=8A=A0=E5=90=8D=E5=AD=97?= =?utf8?q?=E6=9D=BF=E7=BA=A7=E8=87=AA=E5=AE=9A=E4=B9=89=EF=BC=8C=E5=85=81?= =?utf8?q?=E8=AE=B8=E5=8E=82=E5=95=86=E5=9C=A8Android=E4=B8=AD=E5=AE=9A?= =?utf8?q?=E4=B9=89=E4=B8=8D=E5=90=8C=E7=9A=84=E9=94=AE=E7=9B=98=E6=98=A0?= =?utf8?q?=E5=B0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- arch/arm/mach-rk2818/board-raho.c | 3 ++- arch/arm/mach-rk2818/include/mach/board.h | 1 + drivers/input/keyboard/rk2818_adckey.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) 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; -- 2.34.1