powerpc: mpc85xx: Do not build errata command in SPL

[u-boot] / board / gdsys / 405ep / iocon.c

diff --git a/board/gdsys/405ep/iocon.c b/board/gdsys/405ep/iocon.c
index 664b1e164e4ab6e73c6ac00c6a9c601575193737..7484624d13e14d5eefa42e401d15d9390fb0558f 100644 (file)
--- a/board/gdsys/405ep/iocon.c
+++ b/board/gdsys/405ep/iocon.c
@@ -17,6 +17,7 @@
 
 #include "../common/osd.h"
 #include "../common/mclink.h"
+#include "../common/phy.h"
 
 #include <i2c.h>
 #include <pca953x.h>
@@ -98,9 +99,6 @@ enum {
 unsigned int mclink_fpgacount;
 struct ihs_fpga *fpga_ptr[] = CONFIG_SYS_FPGA_PTR;
 
-static int setup_88e1518(const char *bus, unsigned char addr);
-static int verify_88e1518(const char *bus, unsigned char addr);
-
 int fpga_set_reg(u32 fpga, u16 *reg, off_t regoff, u16 data)
 {
        int res;
@@ -181,11 +179,11 @@ static void print_fpga_info(unsigned int fpga, bool rgmii2_present)
        unsigned feature_carriers;
        unsigned feature_video_channels;
 
-       int legacy = get_fpga_state(0) & FPGA_STATE_PLATFORM;
+       int legacy = get_fpga_state(fpga) & FPGA_STATE_PLATFORM;
 
-       FPGA_GET_REG(0, versions, &versions);
-       FPGA_GET_REG(0, fpga_version, &fpga_version);
-       FPGA_GET_REG(0, fpga_features, &fpga_features);
+       FPGA_GET_REG(fpga, versions, &versions);
+       FPGA_GET_REG(fpga, fpga_version, &fpga_version);
+       FPGA_GET_REG(fpga, fpga_features, &fpga_features);
 
        unit_type = (versions & 0xf000) >> 12;
        feature_compression = (fpga_features & 0xe000) >> 13;
@@ -370,18 +368,20 @@ int last_stage_init(void)
        unsigned char mclink_controllers[] = { 0x24, 0x25, 0x26 };
        int legacy = get_fpga_state(0) & FPGA_STATE_PLATFORM;
        u16 fpga_features;
-       int feature_carrier_speed = fpga_features & (1<<4);
+       int feature_carrier_speed;
        bool ch0_rgmii2_present = false;
 
        FPGA_GET_REG(0, fpga_features, &fpga_features);
+       feature_carrier_speed = fpga_features & (1<<4);
 
-       if (!legacy)
-               ch0_rgmii2_present = !pca9698_get_value(0x20, 30);
+       if (!legacy) {
+               /* Turn on Parade DP501 */
+               pca9698_direction_output(0x20, 9, 1);
 
-       print_fpga_info(0, ch0_rgmii2_present);
-       osd_probe(0);
+               ch0_rgmii2_present = !pca9698_get_value(0x20, 30);
+       }
 
-       /* wait for FPGA done */
+       /* wait for FPGA done; then reset FPGA */
        for (k = 0; k < ARRAY_SIZE(mclink_controllers); ++k) {
                unsigned int ctr = 0;
 
@@ -396,6 +396,12 @@ int last_stage_init(void)
                                break;
                        }
                }
+
+               pca953x_set_dir(mclink_controllers[k], MCFPGA_RESET_N, 0);
+               pca953x_set_val(mclink_controllers[k], MCFPGA_RESET_N, 0);
+               udelay(10);
+               pca953x_set_val(mclink_controllers[k], MCFPGA_RESET_N,
+                               MCFPGA_RESET_N);
        }
 
        if (!legacy && (feature_carrier_speed == CARRIER_SPEED_1G)) {
@@ -405,21 +411,20 @@ int last_stage_init(void)
                        if ((mux_ch == 1) && !ch0_rgmii2_present)
                                continue;
 
-                       if (!verify_88e1518(bb_miiphy_buses[0].name, mux_ch)) {
-                               printf("Fixup 88e1518 erratum on %s phy %u\n",
-                                      bb_miiphy_buses[0].name, mux_ch);
-                               setup_88e1518(bb_miiphy_buses[0].name, mux_ch);
-                       }
+                       setup_88e1518(bb_miiphy_buses[0].name, mux_ch);
                }
        }
 
-       /* wait for slave-PLLs to be up and running */
+       /* give slave-PLLs and Parade DP501 some time to be up and running */
        udelay(500000);
 
        mclink_fpgacount = CONFIG_SYS_MCLINK_MAX;
        slaves = mclink_probe();
        mclink_fpgacount = 0;
 
+       print_fpga_info(0, ch0_rgmii2_present);
+       osd_probe(0);
+
        if (slaves <= 0)
                return 0;
 
@@ -434,11 +439,7 @@ int last_stage_init(void)
                if (feature_carrier_speed == CARRIER_SPEED_1G) {
                        miiphy_register(bb_miiphy_buses[k].name,
                                        bb_miiphy_read, bb_miiphy_write);
-                       if (!verify_88e1518(bb_miiphy_buses[k].name, 0)) {
-                               printf("Fixup 88e1518 erratum on %s\n",
-                                      bb_miiphy_buses[k].name);
-                               setup_88e1518(bb_miiphy_buses[k].name, 0);
-                       }
+                       setup_88e1518(bb_miiphy_buses[k].name, 0);
                }
        }
 
@@ -651,57 +652,3 @@ struct bb_miiphy_bus bb_miiphy_buses[] = {
 
 int bb_miiphy_buses_num = sizeof(bb_miiphy_buses) /
                          sizeof(bb_miiphy_buses[0]);
-
-/*
- * Workaround for erratum mentioned in 88E1518 release notes
- */
-
-static int verify_88e1518(const char *bus, unsigned char addr)
-{
-       u16 phy_id1, phy_id2;
-
-       if (miiphy_read(bus, addr, 2, &phy_id1) ||
-           miiphy_read(bus, addr, 3, &phy_id2)) {
-               printf("Error reading from the PHY addr=%02x\n", addr);
-               return -EIO;
-       }
-
-       if ((phy_id1 != 0x0141) || ((phy_id2 & 0xfff0) != 0x0dd0))
-               return -EINVAL;
-
-       return 0;
-}
-
-struct regfix_88e1518 {
-       u8 reg;
-       u16 data;
-} regfix_88e1518[] = {
-       { 22, 0x00ff },
-       { 17, 0x214b },
-       { 16, 0x2144 },
-       { 17, 0x0c28 },
-       { 16, 0x2146 },
-       { 17, 0xb233 },
-       { 16, 0x214d },
-       { 17, 0xcc0c },
-       { 16, 0x2159 },
-       { 22, 0x00fb },
-       {  7, 0xc00d },
-       { 22, 0x0000 },
-};
-
-static int setup_88e1518(const char *bus, unsigned char addr)
-{
-       unsigned int k;
-
-       for (k = 0; k < ARRAY_SIZE(regfix_88e1518); ++k) {
-               if (miiphy_write(bus, addr,
-                                regfix_88e1518[k].reg,
-                                regfix_88e1518[k].data)) {
-                       printf("Error writing to the PHY addr=%02x\n", addr);
-                       return -1;
-               }
-       }
-
-       return 0;
-}