AM335X: Avoid i2c pin mux setup.
authorPatil, Rachna <rachna@ti.com>
Wed, 28 Sep 2011 11:01:50 +0000 (16:31 +0530)
committerVaibhav Hiremath <hvaibhav@ti.com>
Mon, 23 Jan 2012 19:14:23 +0000 (00:44 +0530)
Since i2c1 is available only in some profiles, we bypass i2c pin
muxing in i2c.c file. Pin muxing is taken care of, in the board file
instead.

Signed-off-by: Patil, Rachna <rachna@ti.com>
Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
arch/arm/plat-omap/i2c.c

index 6cddde2007539d48698fe29db77f658e1dac699b..b7fccc85a7ddcf24a27e3400dd4df4580ec421a8 100644 (file)
@@ -148,7 +148,8 @@ static inline int omap2_i2c_add_bus(int bus_id)
        struct omap_i2c_bus_platform_data *pdata;
        struct omap_i2c_dev_attr *dev_attr;
 
-       omap2_i2c_mux_pins(bus_id);
+       if (!cpu_is_am33xx())
+               omap2_i2c_mux_pins(bus_id);
 
        l = snprintf(oh_name, MAX_OMAP_I2C_HWMOD_NAME_LEN, "i2c%d", bus_id);
        WARN(l >= MAX_OMAP_I2C_HWMOD_NAME_LEN,