soft_i2c: move to drivers/i2c

[u-boot] / drivers / i2c / fsl_i2c.c

diff --git a/drivers/i2c/fsl_i2c.c b/drivers/i2c/fsl_i2c.c
index dde057124e9bfb7b18cf24c79011a1a11b521d4c..b7b3a75bc952700ef9a64e365281e75a09578d00 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>
@@ -117,7 +116,6 @@ static unsigned int set_i2c_bus_speed(const struct fsl_i2c *dev,
 {
        unsigned short divider = min(i2c_clk / speed, (unsigned short) -1);
        unsigned int i;
-       u8 fdr, dfsr;
 
        /*
         * We want to choose an FDR/DFSR that generates an I2C bus speed that
@@ -128,15 +126,15 @@ 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;
                        dfsr = fsl_i2c_speed_map[i].dfsr;
                        fdr = fsl_i2c_speed_map[i].fdr;
                        speed = i2c_clk / fsl_i2c_speed_map[i].divider;
+                       writeb(fdr, &dev->fdr);         /* set bus speed */
+                       writeb(dfsr, &dev->dfsrr);      /* set default filter */
                        break;
                }
 
-       writeb(fdr, &dev->fdr);                 /* set bus speed */
-       writeb(dfsr, &dev->dfsrr);              /* set default filter */
-
        return speed;
 }
 
@@ -144,12 +142,15 @@ void
 i2c_init(int speed, int slaveadd)
 {
        struct fsl_i2c *dev;
+       unsigned int temp;
 
        dev = (struct fsl_i2c *) (CFG_IMMR + CFG_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 */
@@ -159,7 +160,9 @@ i2c_init(int speed, int slaveadd)
 
        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 */
@@ -169,12 +172,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;
@@ -184,7 +186,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);
@@ -209,7 +211,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;
@@ -388,4 +390,3 @@ unsigned int i2c_get_bus_speed(void)
 }
 
 #endif /* CONFIG_HARD_I2C */
-#endif /* CONFIG_FSL_I2C */