aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap/include
diff options
context:
space:
mode:
authorJarkko Nikula <jhnikula@gmail.com>2010-02-22 15:29:36 -0500
committerTony Lindgren <tony@atomide.com>2010-02-25 17:45:08 -0500
commit9833eff3d7db76d2d04f28567ed8704d69e225ae (patch)
treed28dbe65312a00ad58d733425941dc38e6d4b5f6 /arch/arm/plat-omap/include
parentb610ec502376d915b76a62e22576c5d0462cc9c9 (diff)
omap: i2c: Fix muxing for command line enabled bus
The commit b63128e81214cc2db2995d690438055c26d213a5 broke the pin muxing for I2C busses that are enabled from the kernel command line. Fix this by defining the board registration function omap_register_i2c_bus in common platform code as it was before but keep the muxing in architecture dependent files. Signed-off-by: Jarkko Nikula <jhnikula@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/plat-omap/include')
-rw-r--r--arch/arm/plat-omap/include/plat/i2c.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/plat-omap/include/plat/i2c.h b/arch/arm/plat-omap/include/plat/i2c.h
index 585d9ca68b97..87f6bf2ea4fa 100644
--- a/arch/arm/plat-omap/include/plat/i2c.h
+++ b/arch/arm/plat-omap/include/plat/i2c.h
@@ -34,6 +34,5 @@ static inline int omap_register_i2c_bus(int bus_id, u32 clkrate,
34} 34}
35#endif 35#endif
36 36
37int omap_plat_register_i2c_bus(int bus_id, u32 clkrate, 37void __init omap1_i2c_mux_pins(int bus_id);
38 struct i2c_board_info const *info, 38void __init omap2_i2c_mux_pins(int bus_id);
39 unsigned len);