diff options
| author | Jarkko Nikula <jhnikula@gmail.com> | 2010-02-22 21:29:36 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-02-25 23:45:08 +0100 |
| commit | 9833eff3d7db76d2d04f28567ed8704d69e225ae (patch) | |
| tree | d28dbe65312a00ad58d733425941dc38e6d4b5f6 /arch/arm/mach-omap1/i2c.c | |
| parent | Merge branch 'for_2.6.34_b' of git://git.pwsan.com/linux-2.6 into omap-for-linus (diff) | |
| download | linux-9833eff3d7db76d2d04f28567ed8704d69e225ae.tar.xz linux-9833eff3d7db76d2d04f28567ed8704d69e225ae.zip | |
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/mach-omap1/i2c.c')
| -rw-r--r-- | arch/arm/mach-omap1/i2c.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/mach-omap1/i2c.c b/arch/arm/mach-omap1/i2c.c index 1bf4735e27a6..5446c9912641 100644 --- a/arch/arm/mach-omap1/i2c.c +++ b/arch/arm/mach-omap1/i2c.c @@ -23,9 +23,7 @@ #include <plat/mux.h> #include <plat/cpu.h> -int __init omap_register_i2c_bus(int bus_id, u32 clkrate, - struct i2c_board_info const *info, - unsigned len) +void __init omap1_i2c_mux_pins(int bus_id) { if (cpu_is_omap7xx()) { omap_cfg_reg(I2C_7XX_SDA); @@ -34,6 +32,4 @@ int __init omap_register_i2c_bus(int bus_id, u32 clkrate, omap_cfg_reg(I2C_SDA); omap_cfg_reg(I2C_SCL); } - - return omap_plat_register_i2c_bus(bus_id, clkrate, info, len); } |