Merge branch 'next'

[u-boot] / board / freescale / corenet_ds / corenet_ds.c

diff --git a/board/freescale/corenet_ds/corenet_ds.c b/board/freescale/corenet_ds/corenet_ds.c
index 3db93c364466f1578a534cf1bae695f6c03b29fc..a33c936fa00997fd9d387f29a498997a1389d636 100644 (file)
--- a/board/freescale/corenet_ds/corenet_ds.c
+++ b/board/freescale/corenet_ds/corenet_ds.c
@@ -32,10 +32,10 @@
 #include <asm/fsl_serdes.h>
 #include <asm/fsl_portals.h>
 #include <asm/fsl_liodn.h>
-
-extern void pci_of_setup(void *blob, bd_t *bd);
+#include <fm_eth.h>
 
 #include "../common/ngpixis.h"
+#include "corenet_ds.h"
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -62,10 +62,6 @@ int checkboard (void)
        else
                printf("invalid setting of SW%u\n", PIXIS_LBMAP_SWITCH);
 
-#ifdef CONFIG_PHYS_64BIT
-       puts("36-bit Addressing\n");
-#endif
-
        /* Display the RCW, so that no one gets confused as to what RCW
         * we're actually using for this boot.
         */
@@ -87,10 +83,21 @@ int checkboard (void)
         * don't match.
         */
        puts("SERDES Reference Clocks: ");
+#if defined(CONFIG_P3041DS) || defined(CONFIG_P5020DS)
+       sw = in_8(&PIXIS_SW(5));
+       for (i = 0; i < 3; i++) {
+               static const char *freq[] = {"100", "125", "156.25", "212.5" };
+               unsigned int clock = (sw >> (6 - (2 * i))) & 3;
+
+               printf("Bank%u=%sMhz ", i+1, freq[clock]);
+       }
+       puts("\n");
+#else
        sw = in_8(&PIXIS_SW(3));
        printf("Bank1=%uMHz ", (sw & 0x40) ? 125 : 100);
        printf("Bank2=%sMHz ", (sw & 0x20) ? "156.25" : "125");
        printf("Bank3=%sMHz\n", (sw & 0x10) ? "156.25" : "125");
+#endif
 
        return 0;
 }
@@ -131,7 +138,9 @@ int board_early_init_r(void)
                        0, flash_esel, BOOKE_PAGESZ_256M, 1);   /* ts, esel, tsize, iprot */
 
        set_liodns();
+#ifdef CONFIG_SYS_DPAA_QBMAN
        setup_portals();
+#endif
 
        return 0;
 }
@@ -146,7 +155,7 @@ static const char *serdes_clock_to_string(u32 clock)
        case SRDS_PLLCR0_RFCK_SEL_156_25:
                return "156.25";
        default:
-               return "???";
+               return "150";
        }
 }
 
@@ -157,19 +166,41 @@ int misc_init_r(void)
        serdes_corenet_t *srds_regs = (void *)CONFIG_SYS_FSL_CORENET_SERDES_ADDR;
        u32 actual[NUM_SRDS_BANKS];
        unsigned int i;
-       u8 sw3;
+       u8 sw;
 
+#if defined(CONFIG_P3041DS) || defined(CONFIG_P5020DS)
+       sw = in_8(&PIXIS_SW(5));
+       for (i = 0; i < 3; i++) {
+               unsigned int clock = (sw >> (6 - (2 * i))) & 3;
+               switch (clock) {
+               case 0:
+                       actual[i] = SRDS_PLLCR0_RFCK_SEL_100;
+                       break;
+               case 1:
+                       actual[i] = SRDS_PLLCR0_RFCK_SEL_125;
+                       break;
+               case 2:
+                       actual[i] = SRDS_PLLCR0_RFCK_SEL_156_25;
+                       break;
+               default:
+                       printf("Warning: SDREFCLK%u switch setting of '11' is "
+                              "unsupported\n", i + 1);
+                       break;
+               }
+       }
+#else
        /* Warn if the expected SERDES reference clocks don't match the
         * actual reference clocks.  This needs to be done after calling
         * p4080_erratum_serdes8(), since that function may modify the clocks.
         */
-       sw3 = in_8(&PIXIS_SW(3));
-       actual[0] = (sw3 & 0x40) ?
+       sw = in_8(&PIXIS_SW(3));
+       actual[0] = (sw & 0x40) ?
                SRDS_PLLCR0_RFCK_SEL_125 : SRDS_PLLCR0_RFCK_SEL_100;
-       actual[1] = (sw3 & 0x20) ?
+       actual[1] = (sw & 0x20) ?
                SRDS_PLLCR0_RFCK_SEL_156_25 : SRDS_PLLCR0_RFCK_SEL_125;
-       actual[2] = (sw3 & 0x10) ?
+       actual[2] = (sw & 0x10) ?
                SRDS_PLLCR0_RFCK_SEL_156_25 : SRDS_PLLCR0_RFCK_SEL_125;
+#endif
 
        for (i = 0; i < NUM_SRDS_BANKS; i++) {
                u32 expected = srds_regs->bank[i].pllcr0 & SRDS_PLLCR0_RFCK_SEL_MASK;
@@ -201,9 +232,10 @@ void ft_board_setup(void *blob, bd_t *bd)
 #endif
 
        fdt_fixup_liodn(blob);
-}
+       fdt_fixup_dr_usb(blob, bd);
 
-int board_eth_init(bd_t *bis)
-{
-       return pci_eth_init(bis);
+#ifdef CONFIG_SYS_DPAA_FMAN
+       fdt_fixup_fman_ethernet(blob);
+       fdt_fixup_board_enet(blob);
+#endif
 }