Merge git://git.denx.de/u-boot into x1

[u-boot] / board / Marvell / common / i2c.c

diff --git a/board/Marvell/common/i2c.c b/board/Marvell/common/i2c.c
index 624ee5cfbc70f98f74bb064e0a95e244036343f7..d426044392900da8835ae9fbb08e1759fbb19e06 100644 (file)
--- a/board/Marvell/common/i2c.c
+++ b/board/Marvell/common/i2c.c
@@ -48,7 +48,7 @@ static void i2c_init (int speed, int slaveaddr)
        unsigned int actualN = 0, actualM = 0;
        unsigned int control, status;
        unsigned int minMargin = 0xffffffff;
-       unsigned int tclk = CFG_TCLK;
+       unsigned int tclk = CONFIG_SYS_TCLK;
        unsigned int i2cFreq = speed;   /* 100000 max. Fast mode not supported */
 
        DP (puts ("i2c_init\n"));
@@ -168,7 +168,7 @@ static uchar i2c_select_device (uchar dev_addr, uchar read, int ten_bit)
 static uchar i2c_get_data (uchar * return_data, int len)
 {
 
-       unsigned int data, status;
+       unsigned int data, status = 0;
        int count = 0;
 
        DP (puts ("i2c_get_data\n"));
@@ -372,7 +372,7 @@ i2c_read (uchar dev_addr, unsigned int offset, int alen, uchar * data,
          int len)
 {
        uchar status = 0;
-       unsigned int i2cFreq = CFG_I2C_SPEED;
+       unsigned int i2cFreq = CONFIG_SYS_I2C_SPEED;
 
        DP (puts ("i2c_read\n"));
 
@@ -447,7 +447,7 @@ i2c_write (uchar dev_addr, unsigned int offset, int alen, uchar * data,
           int len)
 {
        uchar status = 0;
-       unsigned int i2cFreq = CFG_I2C_SPEED;
+       unsigned int i2cFreq = CONFIG_SYS_I2C_SPEED;
 
        DP (puts ("i2c_write\n"));
 
@@ -500,7 +500,7 @@ int i2c_probe (uchar chip)
        unsigned int i2c_status;
 #endif
        uchar status = 0;
-       unsigned int i2cFreq = CFG_I2C_SPEED;
+       unsigned int i2cFreq = CONFIG_SYS_I2C_SPEED;
 
        DP (puts ("i2c_probe\n"));