From f67df6c670a8fcd3f63728afa2314e7eca653bd7 Mon Sep 17 00:00:00 2001 From: Shubhrajyoti Datta Date: Tue, 5 Jul 2011 03:38:24 -0700 Subject: OMAP4: Keyboard: Mux changes in the board file The mux settings for keypad are done for omap4430sdp in board file. Signed-off-by: Shubhrajyoti D [tony@atomide.com: improved formatting a bit] Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/devices.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'arch/arm/mach-omap2/devices.c') diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 5b8ca680ed9..1077ad663f9 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -230,7 +230,7 @@ struct omap_device_pm_latency omap_keyboard_latency[] = { }; int __init omap4_keyboard_init(struct omap4_keypad_platform_data - *sdp4430_keypad_data) + *sdp4430_keypad_data, struct omap_board_data *bdata) { struct omap_device *od; struct omap_hwmod *oh; @@ -257,6 +257,7 @@ int __init omap4_keyboard_init(struct omap4_keypad_platform_data name, oh->name); return PTR_ERR(od); } + oh->mux = omap_hwmod_mux_init(bdata->pads, bdata->pads_cnt); return 0; } -- cgit v1.2.3-70-g09d2