Merge branch 'master' of git://git.denx.de/u-boot-blackfin

[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 d79f2eb2e82ba5eac3e598e9ed1f7331f1296402..1eb37866e3d0d2f815f81519feca8a11f6870f3c 100644 (file)
--- a/board/freescale/common/pq-mds-pib.c
+++ b/board/freescale/common/pq-mds-pib.c
@@ -12,8 +12,6 @@
 #include <i2c.h>
 #include <asm/io.h>
 
-#ifdef CONFIG_PQ_MDS_PIB
-
 #include "pq-mds-pib.h"
 
 int pib_init(void)
@@ -65,7 +63,7 @@ int pib_init(void)
 #endif
 
 #if defined(CONFIG_PQ_MDS_PIB_ATM)
-#if defined(CONFIG_MPC8360EMDS)
+#if defined(CONFIG_MPC8569MDS)
        val8 = 0;
        i2c_write(0x20, 0x6, 1, &val8, 1);
        i2c_write(0x20, 0x7, 1, &val8, 1);
@@ -79,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);
+       val8 = 0;
+       i2c_write(0x26, 0x7, 1, &val8, 1);
+       val8 = 0xf7;
+       i2c_write(0x26, 0x3, 1, &val8, 1);
 
-       val = 0;
-       i2c_write(0x21, 0x6, 1, &val, 1);
-       i2c_write(0x21, 0x7, 1, &val, 1);
+       val8 = 0;
+       i2c_write(0x21, 0x6, 1, &val8, 1);
+       i2c_write(0x21, 0x7, 1, &val8, 1);
 
-       val = 0xdf;
-       i2c_write(0x21, 0x2, 1, &val, 1);
-       val = 0xef;
-       i2c_write(0x21, 0x3, 1, &val, 1);
+       val8 = 0xdf;
+       i2c_write(0x21, 0x2, 1, &val8, 1);
+       val8 = 0xef;
+       i2c_write(0x21, 0x3, 1, &val8, 1);
 
        eieio();
 
@@ -102,4 +100,3 @@ int pib_init(void)
        i2c_set_bus_num(orig_i2c_bus);
        return 0;
 }
-#endif /* CONFIG_PQ_MDS_PIB */