Coding style cleanup

[u-boot] / board / mpc8349itx / pci.c

diff --git a/board/mpc8349itx/pci.c b/board/mpc8349itx/pci.c
index b4637bc8cdfd165c53510a4914502ab5aa2f458c..e81ad2735686c616e73229dbd376da84eeee9f9b 100644 (file)
--- a/board/mpc8349itx/pci.c
+++ b/board/mpc8349itx/pci.c
@@ -29,6 +29,9 @@
 #include <pci.h>
 #include <asm/mpc8349_pci.h>
 #include <i2c.h>
+#if defined(CONFIG_OF_FLAT_TREE)
+#include <ft_build.h>
+#endif
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -88,7 +91,7 @@ void pci_init_board(void)
        u32 dev;
        struct pci_controller *hose;
 
-       immr = (immap_t *) CFG_IMMRBAR;
+       immr = (immap_t *) CFG_IMMR;
        clk = (clk83xx_t *) & immr->clk;
        pci_law = immr->sysconf.pcilaw;
        pci_pot = immr->ios.pot;
@@ -105,7 +108,7 @@ void pci_init_board(void)
        udelay(2000);
 
 #ifdef CONFIG_HARD_I2C
-       i2c_set_bus_num(2);
+       i2c_set_bus_num(1);
        /* Read the PCI_M66EN jumper setting */
        if ((i2c_read(CFG_I2C_8574_ADDR2, 0, 0, &reg8, sizeof(reg8)) == 0) ||
            (i2c_read(CFG_I2C_8574A_ADDR2, 0, 0, &reg8, sizeof(reg8)) == 0)) {
@@ -211,7 +214,7 @@ void pci_init_board(void)
        hose->region_count = 4;
 
        pci_setup_indirect(hose,
-                          (CFG_IMMRBAR + 0x8300), (CFG_IMMRBAR + 0x8304));
+                          (CFG_IMMR + 0x8300), (CFG_IMMR + 0x8304));
 
        pci_register_hose(hose);
 
@@ -302,7 +305,7 @@ void pci_init_board(void)
        hose->region_count = 4;
 
        pci_setup_indirect(hose,
-                          (CFG_IMMRBAR + 0x8380), (CFG_IMMRBAR + 0x8384));
+                          (CFG_IMMR + 0x8380), (CFG_IMMR + 0x8384));
 
        pci_register_hose(hose);