diff options
author | Fabio Estevam <fabio.estevam@freescale.com> | 2011-06-27 16:12:11 -0400 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-07-07 04:01:13 -0400 |
commit | 22785de54bfeae4809a469483d9021730fe2f106 (patch) | |
tree | b9ccfa6b0ad8e7287395f9bd46aa025f46a36f31 /arch/arm | |
parent | e1fb61e38f8ec8e586c63d67a06197aa44ba952e (diff) |
ARM: mx53: Add keypad support
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-mx5/clock-mx51-mx53.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-mx5/devices-imx53.h | 4 | ||||
-rw-r--r-- | arch/arm/plat-mxc/devices/platform-imx-keypad.c | 5 |
3 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-mx5/clock-mx51-mx53.c b/arch/arm/mach-mx5/clock-mx51-mx53.c index 3a269f0c952f..ff16d86ff597 100644 --- a/arch/arm/mach-mx5/clock-mx51-mx53.c +++ b/arch/arm/mach-mx5/clock-mx51-mx53.c | |||
@@ -1493,6 +1493,7 @@ static struct clk_lookup mx53_lookups[] = { | |||
1493 | _REGISTER_CLOCK("imx-ssi.0", NULL, ssi1_clk) | 1493 | _REGISTER_CLOCK("imx-ssi.0", NULL, ssi1_clk) |
1494 | _REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk) | 1494 | _REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk) |
1495 | _REGISTER_CLOCK("imx-ssi.2", NULL, ssi3_clk) | 1495 | _REGISTER_CLOCK("imx-ssi.2", NULL, ssi3_clk) |
1496 | _REGISTER_CLOCK("imx-keypad", NULL, dummy_clk) | ||
1496 | }; | 1497 | }; |
1497 | 1498 | ||
1498 | static void clk_tree_init(void) | 1499 | static void clk_tree_init(void) |
diff --git a/arch/arm/mach-mx5/devices-imx53.h b/arch/arm/mach-mx5/devices-imx53.h index b8a492fe2200..c27fe8bb4762 100644 --- a/arch/arm/mach-mx5/devices-imx53.h +++ b/arch/arm/mach-mx5/devices-imx53.h | |||
@@ -36,3 +36,7 @@ extern const struct imx_imx2_wdt_data imx53_imx2_wdt_data[]; | |||
36 | extern const struct imx_imx_ssi_data imx53_imx_ssi_data[]; | 36 | extern const struct imx_imx_ssi_data imx53_imx_ssi_data[]; |
37 | #define imx53_add_imx_ssi(id, pdata) \ | 37 | #define imx53_add_imx_ssi(id, pdata) \ |
38 | imx_add_imx_ssi(&imx53_imx_ssi_data[id], pdata) | 38 | imx_add_imx_ssi(&imx53_imx_ssi_data[id], pdata) |
39 | |||
40 | extern const struct imx_imx_keypad_data imx53_imx_keypad_data; | ||
41 | #define imx53_add_imx_keypad(pdata) \ | ||
42 | imx_add_imx_keypad(&imx53_imx_keypad_data, pdata) | ||
diff --git a/arch/arm/plat-mxc/devices/platform-imx-keypad.c b/arch/arm/plat-mxc/devices/platform-imx-keypad.c index 26366114b021..479c3e9f771f 100644 --- a/arch/arm/plat-mxc/devices/platform-imx-keypad.c +++ b/arch/arm/plat-mxc/devices/platform-imx-keypad.c | |||
@@ -46,6 +46,11 @@ const struct imx_imx_keypad_data imx51_imx_keypad_data __initconst = | |||
46 | imx_imx_keypad_data_entry_single(MX51, SZ_16); | 46 | imx_imx_keypad_data_entry_single(MX51, SZ_16); |
47 | #endif /* ifdef CONFIG_SOC_IMX51 */ | 47 | #endif /* ifdef CONFIG_SOC_IMX51 */ |
48 | 48 | ||
49 | #ifdef CONFIG_SOC_IMX53 | ||
50 | const struct imx_imx_keypad_data imx53_imx_keypad_data __initconst = | ||
51 | imx_imx_keypad_data_entry_single(MX53, SZ_16); | ||
52 | #endif /* ifdef CONFIG_SOC_IMX53 */ | ||
53 | |||
49 | struct platform_device *__init imx_add_imx_keypad( | 54 | struct platform_device *__init imx_add_imx_keypad( |
50 | const struct imx_imx_keypad_data *data, | 55 | const struct imx_imx_keypad_data *data, |
51 | const struct matrix_keymap_data *pdata) | 56 | const struct matrix_keymap_data *pdata) |