diff options
| author | eric miao <eric.miao@marvell.com> | 2008-01-23 13:39:13 +0800 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-04-19 11:29:05 +0100 |
| commit | 37320980414f5a7654ee08a047194224c6bba46e (patch) | |
| tree | a8d6efa1f182e22b2f05ab5d31722d97acd7d7dc /arch/arm/mach-pxa/pxa27x.c | |
| parent | 450d28749c9bf2cc6d274695fe454bb53456428d (diff) | |
| download | kernel_samsung_smdk4412-37320980414f5a7654ee08a047194224c6bba46e.zip kernel_samsung_smdk4412-37320980414f5a7654ee08a047194224c6bba46e.tar.gz kernel_samsung_smdk4412-37320980414f5a7654ee08a047194224c6bba46e.tar.bz2 | |
[ARM] pxa: add pxa27x_keypad device and pxa_set_keypad_info()
also update the clk definitions in pxa27x and pxa3xx.
Signed-off-by: eric miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-pxa/pxa27x.c')
| -rw-r--r-- | arch/arm/mach-pxa/pxa27x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c index b230af2..f910fe5 100644 --- a/arch/arm/mach-pxa/pxa27x.c +++ b/arch/arm/mach-pxa/pxa27x.c @@ -152,7 +152,7 @@ static struct clk pxa27x_clks[] = { INIT_CKEN("USBCLK", USBHOST, 48000000, 0, &pxa27x_device_ohci.dev), INIT_CKEN("I2CCLK", PWRI2C, 13000000, 0, &pxa27x_device_i2c_power.dev), - INIT_CKEN("KBDCLK", KEYPAD, 32768, 0, NULL), + INIT_CKEN("KBDCLK", KEYPAD, 32768, 0, &pxa27x_device_keypad.dev), INIT_CKEN("SSPCLK", SSP1, 13000000, 0, &pxa27x_device_ssp1.dev), INIT_CKEN("SSPCLK", SSP2, 13000000, 0, &pxa27x_device_ssp2.dev), |