rename CFG_ macros to CONFIG_SYS

[platform/kernel/u-boot.git] / drivers / i2c / fsl_i2c.c

diff --git a/drivers/i2c/fsl_i2c.c b/drivers/i2c/fsl_i2c.c
index 9f2c1ec..281a88b 100644 (file)
--- a/drivers/i2c/fsl_i2c.c
+++ b/drivers/i2c/fsl_i2c.c
@@ -18,7 +18,6 @@
 
 #include <common.h>
 
-#ifdef CONFIG_FSL_I2C
 #ifdef CONFIG_HARD_I2C
 
 #include <command.h>
@@ -27,7 +26,7 @@
 #include <asm/io.h>
 #include <asm/fsl_i2c.h>       /* HW definitions */
 
-#define I2C_TIMEOUT    (CFG_HZ / 4)
+#define I2C_TIMEOUT    (CONFIG_SYS_HZ / 4)
 
 #define I2C_READ_BIT  1
 #define I2C_WRITE_BIT 0
@@ -39,18 +38,18 @@ DECLARE_GLOBAL_DATA_PTR;
  * runs from ROM, and we can't switch buses because we can't modify
  * the global variables.
  */
-#ifdef CFG_SPD_BUS_NUM
-static unsigned int i2c_bus_num __attribute__ ((section ("data"))) = CFG_SPD_BUS_NUM;
+#ifdef CONFIG_SYS_SPD_BUS_NUM
+static unsigned int i2c_bus_num __attribute__ ((section ("data"))) = CONFIG_SYS_SPD_BUS_NUM;
 #else
 static unsigned int i2c_bus_num __attribute__ ((section ("data"))) = 0;
 #endif
 
-static unsigned int i2c_bus_speed[2] = {CFG_I2C_SPEED, CFG_I2C_SPEED};
+static unsigned int i2c_bus_speed[2] = {CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SPEED};
 
 static const struct fsl_i2c *i2c_dev[2] = {
-       (struct fsl_i2c *) (CFG_IMMR + CFG_I2C_OFFSET),
-#ifdef CFG_I2C2_OFFSET
-       (struct fsl_i2c *) (CFG_IMMR + CFG_I2C2_OFFSET)
+       (struct fsl_i2c *) (CONFIG_SYS_IMMR + CONFIG_SYS_I2C_OFFSET),
+#ifdef CONFIG_SYS_I2C2_OFFSET
+       (struct fsl_i2c *) (CONFIG_SYS_IMMR + CONFIG_SYS_I2C2_OFFSET)
 #endif
 };
 
@@ -77,12 +76,20 @@ static const struct fsl_i2c *i2c_dev[2] = {
  * For this table, the values are based on a value of 1 for the DFSR
  * register.  See the application note AN2919 "Determining the I2C Frequency
  * Divider Ratio for SCL"
+ *
+ * ColdFire I2C frequency dividers for FDR values are different from
+ * PowerPC. The protocol to use the I2C module is still the same.
+ * A different table is defined and are based on MCF5xxx user manual.
+ *
  */
 static const struct {
        unsigned short divider;
+#ifdef __PPC__
        u8 dfsr;
+#endif
        u8 fdr;
 } fsl_i2c_speed_map[] = {
+#ifdef __PPC__
        {160, 1, 32}, {192, 1, 33}, {224, 1, 34}, {256, 1, 35},
        {288, 1, 0}, {320, 1, 1}, {352, 6, 1}, {384, 1, 2}, {416, 6, 2},
        {448, 1, 38}, {480, 1, 3}, {512, 1, 39}, {544, 11, 3}, {576, 1, 4},
@@ -99,6 +106,25 @@ static const struct {
        {20480, 1, 25}, {24576, 1, 26}, {28672, 1, 62}, {30720, 1, 27},
        {32768, 1, 63}, {36864, 1, 28}, {40960, 1, 29}, {49152, 1, 30},
        {61440, 1, 31}, {-1, 1, 31}
+#elif defined(__M68K__)
+       {20, 32}, {22, 33}, {24, 34}, {26, 35},
+       {28, 0}, {28, 36}, {30, 1}, {32, 37},
+       {34, 2}, {36, 38}, {40, 3}, {40, 39},
+       {44, 4}, {48, 5}, {48, 40}, {56, 6},
+       {56, 41}, {64, 42}, {68, 7}, {72, 43},
+       {80, 8}, {80, 44}, {88, 9}, {96, 41},
+       {104, 10}, {112, 42}, {128, 11}, {128, 43},
+       {144, 12}, {160, 13}, {160, 48}, {192, 14},
+       {192, 49}, {224, 50}, {240, 15}, {256, 51},
+       {288, 16}, {320, 17}, {320, 52}, {384, 18},
+       {384, 53}, {448, 54}, {480, 19}, {512, 55},
+       {576, 20}, {640, 21}, {640, 56}, {768, 22},
+       {768, 57}, {960, 23}, {896, 58}, {1024, 59},
+       {1152, 24}, {1280, 25}, {1280, 60}, {1536, 26},
+       {1536, 61}, {1792, 62}, {1920, 27}, {2048, 63},
+       {2304, 28}, {2560, 29}, {3072, 30}, {3840, 31},
+       {-1, 31}
+#endif
 };
 
 /**
@@ -127,12 +153,17 @@ static unsigned int set_i2c_bus_speed(const struct fsl_i2c *dev,
 
        for (i = 0; i < ARRAY_SIZE(fsl_i2c_speed_map); i++)
                if (fsl_i2c_speed_map[i].divider >= divider) {
-                       u8 fdr, dfsr;
+                       u8 fdr;
+#ifdef __PPC__
+                       u8 dfsr;
                        dfsr = fsl_i2c_speed_map[i].dfsr;
+#endif
                        fdr = fsl_i2c_speed_map[i].fdr;
                        speed = i2c_clk / fsl_i2c_speed_map[i].divider;
                        writeb(fdr, &dev->fdr);         /* set bus speed */
+#ifdef __PPC__
                        writeb(dfsr, &dev->dfsrr);      /* set default filter */
+#endif
                        break;
                }
 
@@ -143,22 +174,27 @@ void
 i2c_init(int speed, int slaveadd)
 {
        struct fsl_i2c *dev;
+       unsigned int temp;
 
-       dev = (struct fsl_i2c *) (CFG_IMMR + CFG_I2C_OFFSET);
+       dev = (struct fsl_i2c *) (CONFIG_SYS_IMMR + CONFIG_SYS_I2C_OFFSET);
 
        writeb(0, &dev->cr);                    /* stop I2C controller */
        udelay(5);                              /* let it shutdown in peace */
-       i2c_bus_speed[0] = set_i2c_bus_speed(dev, gd->i2c1_clk, speed);
+       temp = set_i2c_bus_speed(dev, gd->i2c1_clk, speed);
+       if (gd->flags & GD_FLG_RELOC)
+               i2c_bus_speed[0] = temp;
        writeb(slaveadd << 1, &dev->adr);       /* write slave address */
        writeb(0x0, &dev->sr);                  /* clear status register */
        writeb(I2C_CR_MEN, &dev->cr);           /* start I2C controller */
 
-#ifdef CFG_I2C2_OFFSET
-       dev = (struct fsl_i2c *) (CFG_IMMR + CFG_I2C2_OFFSET);
+#ifdef CONFIG_SYS_I2C2_OFFSET
+       dev = (struct fsl_i2c *) (CONFIG_SYS_IMMR + CONFIG_SYS_I2C2_OFFSET);
 
        writeb(0, &dev->cr);                    /* stop I2C controller */
        udelay(5);                              /* let it shutdown in peace */
-       i2c_bus_speed[1] = set_i2c_bus_speed(dev, gd->i2c2_clk, speed);
+       temp = set_i2c_bus_speed(dev, gd->i2c2_clk, speed);
+       if (gd->flags & GD_FLG_RELOC)
+               i2c_bus_speed[1] = temp;
        writeb(slaveadd << 1, &dev->adr);       /* write slave address */
        writeb(0x0, &dev->sr);                  /* clear status register */
        writeb(I2C_CR_MEN, &dev->cr);           /* start I2C controller */
@@ -168,12 +204,11 @@ i2c_init(int speed, int slaveadd)
 static __inline__ int
 i2c_wait4bus(void)
 {
-       ulong timeval = get_timer(0);
+       unsigned long long timeval = get_ticks();
 
        while (readb(&i2c_dev[i2c_bus_num]->sr) & I2C_SR_MBB) {
-               if (get_timer(timeval) > I2C_TIMEOUT) {
+               if ((get_ticks() - timeval) > usec2ticks(I2C_TIMEOUT))
                        return -1;
-               }
        }
 
        return 0;
@@ -183,7 +218,7 @@ static __inline__ int
 i2c_wait(int write)
 {
        u32 csr;
-       ulong timeval = get_timer(0);
+       unsigned long long timeval = get_ticks();
 
        do {
                csr = readb(&i2c_dev[i2c_bus_num]->sr);
@@ -208,7 +243,7 @@ i2c_wait(int write)
                }
 
                return 0;
-       } while (get_timer (timeval) < I2C_TIMEOUT);
+       } while ((get_ticks() - timeval) < usec2ticks(I2C_TIMEOUT));
 
        debug("i2c_wait: timed out\n");
        return -1;
@@ -351,7 +386,7 @@ i2c_reg_write(uchar i2c_addr, uchar reg, uchar val)
 
 int i2c_set_bus_num(unsigned int bus)
 {
-#ifdef CFG_I2C2_OFFSET
+#ifdef CONFIG_SYS_I2C2_OFFSET
        if (bus > 1) {
 #else
        if (bus > 0) {
@@ -387,4 +422,3 @@ unsigned int i2c_get_bus_speed(void)
 }
 
 #endif /* CONFIG_HARD_I2C */
-#endif /* CONFIG_FSL_I2C */