Merge branch 'master' of ssh://10.10.0.7/home/wd/git/u-boot/master

[oweals/u-boot.git] / board / freescale / common / pq-mds-pib.c

diff --git a/board/freescale/common/pq-mds-pib.c b/board/freescale/common/pq-mds-pib.c
index 9799117a93aa34285958d76e6b52edbe8dba3a1e..6c72aa1a43f25e81bbaa3ee84f7fca180462dac7 100644 (file)
--- a/board/freescale/common/pq-mds-pib.c
+++ b/board/freescale/common/pq-mds-pib.c
@@ -22,9 +22,10 @@ int pib_init(void)
        /* Switch temporarily to I2C bus #2 */
        orig_i2c_bus = i2c_get_bus_num();
        i2c_set_bus_num(1);
+
+       val8 = 0;
 #if defined(CONFIG_PCI) && !defined(CONFIG_PCISLAVE)
        /* Assign PIB PMC slot to desired PCI bus */
-       val8 = 0;
        i2c_write(0x23, 0x6, 1, &val8, 1);
        i2c_write(0x23, 0x7, 1, &val8, 1);
        val8 = 0xff;
@@ -76,19 +77,19 @@ int pib_init(void)
 
        printf("QOC3 ATM card on PMC0\n");
 #elif defined(CONFIG_MPC832XEMDS)
-       val = 0;
-       i2c_write(0x26, 0x7, 1, &val, 1);
-       val = 0xf7;
-       i2c_write(0x26, 0x3, 1, &val, 1);
-
-       val = 0;
-       i2c_write(0x21, 0x6, 1, &val, 1);
-       i2c_write(0x21, 0x7, 1, &val, 1);
-
-       val = 0xdf;
-       i2c_write(0x21, 0x2, 1, &val, 1);
-       val = 0xef;
-       i2c_write(0x21, 0x3, 1, &val, 1);
+       val8 = 0;
+       i2c_write(0x26, 0x7, 1, &val8, 1);
+       val8 = 0xf7;
+       i2c_write(0x26, 0x3, 1, &val8, 1);
+
+       val8 = 0;
+       i2c_write(0x21, 0x6, 1, &val8, 1);
+       i2c_write(0x21, 0x7, 1, &val8, 1);
+
+       val8 = 0xdf;
+       i2c_write(0x21, 0x2, 1, &val8, 1);
+       val8 = 0xef;
+       i2c_write(0x21, 0x3, 1, &val8, 1);
 
        eieio();