diff options
| author | Eric Miao <eric.y.miao@gmail.com> | 2008-01-31 00:58:00 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-01-31 00:58:00 -0500 |
| commit | 1a1cd739a4b985f87c47e2809db7e240dba2c385 (patch) | |
| tree | e43fbc8b1e47122844acd727aaf5490b7a9f5b38 | |
| parent | 0e5f11aa80bd01d048f374cc64ef0819ad7d86f2 (diff) | |
Input: pxa27x_keypad - remove pin configuration from the driver
The pin configurations will slowly be moved to the board specific code
at initialization thus to make the driver more generic.
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| -rw-r--r-- | drivers/input/keyboard/pxa27x_keypad.c | 4 | ||||
| -rw-r--r-- | include/asm-arm/arch-pxa/pxa27x_keypad.h | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/drivers/input/keyboard/pxa27x_keypad.c b/drivers/input/keyboard/pxa27x_keypad.c index 06c1d5abaa81..43fb63d68122 100644 --- a/drivers/input/keyboard/pxa27x_keypad.c +++ b/drivers/input/keyboard/pxa27x_keypad.c | |||
| @@ -208,10 +208,6 @@ static int __devinit pxa27x_keypad_probe(struct platform_device *pdev) | |||
| 208 | if (error) | 208 | if (error) |
| 209 | goto err_free_irq; | 209 | goto err_free_irq; |
| 210 | 210 | ||
| 211 | /* Setup GPIOs. */ | ||
| 212 | for (i = 0; i < pdata->nr_rows + pdata->nr_cols; i++) | ||
| 213 | pxa_gpio_mode(pdata->gpio_modes[i]); | ||
| 214 | |||
| 215 | /* | 211 | /* |
| 216 | * Store rows/cols info into keyboard registers. | 212 | * Store rows/cols info into keyboard registers. |
| 217 | */ | 213 | */ |
diff --git a/include/asm-arm/arch-pxa/pxa27x_keypad.h b/include/asm-arm/arch-pxa/pxa27x_keypad.h index f19f74adde00..ef17db6d791e 100644 --- a/include/asm-arm/arch-pxa/pxa27x_keypad.h +++ b/include/asm-arm/arch-pxa/pxa27x_keypad.h | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | struct pxa27x_keypad_platform_data { | 4 | struct pxa27x_keypad_platform_data { |
| 5 | int nr_rows, nr_cols; | 5 | int nr_rows, nr_cols; |
| 6 | int keycodes[PXAKBD_MAXROW][PXAKBD_MAXCOL]; | 6 | int keycodes[PXAKBD_MAXROW][PXAKBD_MAXCOL]; |
| 7 | int gpio_modes[PXAKBD_MAXROW + PXAKBD_MAXCOL]; | ||
| 8 | 7 | ||
| 9 | #ifdef CONFIG_PM | 8 | #ifdef CONFIG_PM |
| 10 | u32 reg_kpc; | 9 | u32 reg_kpc; |
