diff options
| author | Shubhrajyoti Datta <shubhrajyoti@ti.com> | 2011-07-05 14:38:24 +0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-07-05 14:38:24 +0400 |
| commit | f67df6c670a8fcd3f63728afa2314e7eca653bd7 (patch) | |
| tree | 86cc2cb8cea53d40c8d9abcd9fa03f30bcdde63c /arch/arm/mach-omap2/devices.c | |
| parent | 6de8bae86c0459a881cead6735cd6971334cadd3 (diff) | |
| download | linux-f67df6c670a8fcd3f63728afa2314e7eca653bd7.tar.xz | |
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 <shubhrajyoti@ti.com>
[tony@atomide.com: improved formatting a bit]
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/devices.c')
| -rw-r--r-- | arch/arm/mach-omap2/devices.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 5b8ca680ed93..1077ad663f93 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; } |