vexpress: use correct timer address on extended memory map systems

[karo-tx-uboot.git] / drivers / i2c / omap1510_i2c.c

diff --git a/drivers/i2c/omap1510_i2c.c b/drivers/i2c/omap1510_i2c.c
index 04400fbcd2355ca35c7fb0918e5d7845f3b1f406..f91ee8884a2b814552c8e15f12dc3e212ef2a214 100644 (file)
--- a/drivers/i2c/omap1510_i2c.c
+++ b/drivers/i2c/omap1510_i2c.c
@@ -20,8 +20,6 @@
 
 #include <common.h>
 
-#ifdef CONFIG_DRIVER_OMAP1510_I2C
-
 static void wait_for_bb (void);
 static u16 wait_for_pin (void);
 
@@ -34,7 +32,7 @@ void i2c_init (int speed, int slaveadd)
                udelay (5000);
        }
 
-       /* 12Mhz I2C module clock */
+       /* 12MHz I2C module clock */
        outw (0, I2C_PSC);
        outw (I2C_CON_EN, I2C_CON);
        outw (0, I2C_SYSTEST);
@@ -207,7 +205,7 @@ int i2c_read (uchar chip, uint addr, int alen, uchar * buffer, int len)
        for (i = 0; i < len; i++) {
                if (i2c_read_byte (chip, addr + i, &buffer[i])) {
                        printf ("I2C read: I/O error\n");
-                       i2c_init (CFG_I2C_SPEED, CFG_I2C_SLAVE);
+                       i2c_init (CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
                        return 1;
                }
        }
@@ -232,7 +230,7 @@ int i2c_write (uchar chip, uint addr, int alen, uchar * buffer, int len)
        for (i = 0; i < len; i++) {
                if (i2c_write_byte (chip, addr + i, buffer[i])) {
                        printf ("I2C read: I/O error\n");
-                       i2c_init (CFG_I2C_SPEED, CFG_I2C_SLAVE);
+                       i2c_init (CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
                        return 1;
                }
        }
@@ -277,5 +275,3 @@ static u16 wait_for_pin (void)
 
        return status;
 }
-
-#endif /* CONFIG_DRIVER_OMAP1510_I2C */