diff options
Diffstat (limited to 'arch/arm/mach-omap2/devices.c')
-rw-r--r-- | arch/arm/mach-omap2/devices.c | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index e58609b312c7..592ba0a0ecf3 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c | |||
@@ -18,7 +18,6 @@ | |||
18 | #include <linux/slab.h> | 18 | #include <linux/slab.h> |
19 | #include <linux/of.h> | 19 | #include <linux/of.h> |
20 | #include <linux/pinctrl/machine.h> | 20 | #include <linux/pinctrl/machine.h> |
21 | #include <linux/platform_data/omap4-keypad.h> | ||
22 | #include <linux/platform_data/mailbox-omap.h> | 21 | #include <linux/platform_data/mailbox-omap.h> |
23 | 22 | ||
24 | #include <asm/mach-types.h> | 23 | #include <asm/mach-types.h> |
@@ -29,7 +28,6 @@ | |||
29 | #include "iomap.h" | 28 | #include "iomap.h" |
30 | #include "omap_hwmod.h" | 29 | #include "omap_hwmod.h" |
31 | #include "omap_device.h" | 30 | #include "omap_device.h" |
32 | #include "omap4-keypad.h" | ||
33 | 31 | ||
34 | #include "soc.h" | 32 | #include "soc.h" |
35 | #include "common.h" | 33 | #include "common.h" |
@@ -255,37 +253,6 @@ static inline void omap_init_camera(void) | |||
255 | #endif | 253 | #endif |
256 | } | 254 | } |
257 | 255 | ||
258 | int __init omap4_keyboard_init(struct omap4_keypad_platform_data | ||
259 | *sdp4430_keypad_data, struct omap_board_data *bdata) | ||
260 | { | ||
261 | struct platform_device *pdev; | ||
262 | struct omap_hwmod *oh; | ||
263 | struct omap4_keypad_platform_data *keypad_data; | ||
264 | unsigned int id = -1; | ||
265 | char *oh_name = "kbd"; | ||
266 | char *name = "omap4-keypad"; | ||
267 | |||
268 | oh = omap_hwmod_lookup(oh_name); | ||
269 | if (!oh) { | ||
270 | pr_err("Could not look up %s\n", oh_name); | ||
271 | return -ENODEV; | ||
272 | } | ||
273 | |||
274 | keypad_data = sdp4430_keypad_data; | ||
275 | |||
276 | pdev = omap_device_build(name, id, oh, keypad_data, | ||
277 | sizeof(struct omap4_keypad_platform_data)); | ||
278 | |||
279 | if (IS_ERR(pdev)) { | ||
280 | WARN(1, "Can't build omap_device for %s:%s.\n", | ||
281 | name, oh->name); | ||
282 | return PTR_ERR(pdev); | ||
283 | } | ||
284 | oh->mux = omap_hwmod_mux_init(bdata->pads, bdata->pads_cnt); | ||
285 | |||
286 | return 0; | ||
287 | } | ||
288 | |||
289 | #if defined(CONFIG_OMAP2PLUS_MBOX) || defined(CONFIG_OMAP2PLUS_MBOX_MODULE) | 256 | #if defined(CONFIG_OMAP2PLUS_MBOX) || defined(CONFIG_OMAP2PLUS_MBOX_MODULE) |
290 | static inline void __init omap_init_mbox(void) | 257 | static inline void __init omap_init_mbox(void) |
291 | { | 258 | { |