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

[u-boot] / board / freescale / mpc7448hpc2 / tsi108_init.c

diff --git a/board/freescale/mpc7448hpc2/tsi108_init.c b/board/freescale/mpc7448hpc2/tsi108_init.c
index 30ae17d87295ed2d90d3f1a325904c57d564247d..9c40b72a18bfa207355258d38d33e2873710a676 100644 (file)
--- a/board/freescale/mpc7448hpc2/tsi108_init.c
+++ b/board/freescale/mpc7448hpc2/tsi108_init.c
@@ -79,7 +79,7 @@ PB2OCN_LUT_ENTRY pb2ocn_lut1[32] = {
        /* 24 - 31 */
        {0x00000000, 0x00000201}, /* PBA=0xF800_0000 -> PCI/X (Byte-Swap) */
        {0x00000000, 0x00000201}, /* PBA=0xF900_0000 -> PCI/X (Byte-Swap) */
-       {0x00000000, 0x00000201}, /* PBA=0xFA00_0000 -> PCI/X  PCI I/O (Byte-Swap) */
+       {0x00000000, 0x00000241}, /* PBA=0xFA00_0000 -> PCI/X  PCI I/O (Byte-Swap + Translate) */
        {0x00000000, 0x00000201}, /* PBA=0xFB00_0000 -> PCI/X  PCI Config (Byte-Swap) */
 
        {0x00000000, 0x02000240}, /* PBA=0xFC00_0000 -> HLP */
@@ -165,8 +165,8 @@ int board_early_init_f (void)
                printf ("Invalid DDR2 clock setting\n");
                return -1;
        }
-       printf ("BUS: %d MHz\n", get_board_bus_clk() / 1000000);
-       printf ("MEM: %d MHz\n", gd->mem_clk / 1000000);
+       printf ("BUS: %lu MHz\n", get_board_bus_clk() / 1000000);
+       printf ("MEM: %lu MHz\n", gd->mem_clk / 1000000);
        return 0;
 }
 
@@ -380,7 +380,7 @@ int board_early_init_r (void)
         */
 
        out32 (CFG_TSI108_CSR_BASE + TSI108_PCI_REG_OFFSET + PCI_PFAB_IO,
-               0xFA000001);
+               0x00000001);
        __asm__ __volatile__ ("sync");
 
        /*
@@ -616,14 +616,14 @@ int misc_init_r (void)
                0x802e0044);    /* D=0.25% */
        out32 (CFG_TSI108_CSR_BASE +
                TSI108_CLK_REG_OFFSET + CG_PLL0_CTRL0,
-               0x80000000 | pll0_config[i].ctrl0);
+               0x80000000 | pll0_config[i].ctrl0);
 #endif /* CFG_CLK_SPREAD */
 
 #ifdef CFG_L2
        l2cache_enable ();
 #endif
-       printf ("BUS:   %d MHz\n", gd->bus_clk / 1000000);
-       printf ("MEM:   %d MHz\n", gd->mem_clk / 1000000);
+       printf ("BUS:   %lu MHz\n", gd->bus_clk / 1000000);
+       printf ("MEM:   %lu MHz\n", gd->mem_clk / 1000000);
 
        /*
         * All the information needed to print the cache details is avaiblable