2 files changed, 10 insertions, 8 deletions

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 9e56c3989d68..0d9667921f61 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -196,7 +196,7 @@ config I2C_IBM_IIC
 
 config I2C_IOP3XX
         tristate "Intel IOP3xx and IXP4xx on-chip I2C interface"
-        depends on (ARCH_IOP3XX || ARCH_IXP4XX) && I2C
+        depends on (ARCH_IOP32X || ARCH_IOP33X || ARCH_IXP4XX) && I2C
         help
           Say Y here if you want to use the IIC bus controller on
           the Intel IOP3xx I/O Processors or IXP4xx Network Processors.
diff --git a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/i2c-iop3xx.c
index 8e413150af37..4436c89be58e 100644
--- a/drivers/i2c/busses/i2c-iop3xx.c
+++ b/drivers/i2c/busses/i2c-iop3xx.c
@@ -82,14 +82,16 @@ iop3xx_i2c_enable(struct i2c_algo_iop3xx_data *iop3xx_adap)
 
         /* 
          * Every time unit enable is asserted, GPOD needs to be cleared
-         * on IOP321 to avoid data corruption on the bus.
+         * on IOP3XX to avoid data corruption on the bus.
          */
-#ifdef CONFIG_ARCH_IOP321
-#define IOP321_GPOD_I2C0    0x00c0  /* clear these bits to enable ch0 */
-#define IOP321_GPOD_I2C1    0x0030  /* clear these bits to enable ch1 */
-
-        *IOP321_GPOD &= (iop3xx_adap->id == 0) ? ~IOP321_GPOD_I2C0 : 
-                ~IOP321_GPOD_I2C1;
+#ifdef CONFIG_PLAT_IOP
+        if (iop3xx_adap->id == 0) {
+                gpio_line_set(IOP3XX_GPIO_LINE(7), GPIO_LOW);
+                gpio_line_set(IOP3XX_GPIO_LINE(6), GPIO_LOW);
+        } else {
+                gpio_line_set(IOP3XX_GPIO_LINE(5), GPIO_LOW);
+                gpio_line_set(IOP3XX_GPIO_LINE(4), GPIO_LOW);
+        }
 #endif
         /* NB SR bits not same position as CR IE bits :-( */
         iop3xx_adap->SR_enabled =