Merge branch 'tom' of git://git.denx.de/u-boot-x86

[karo-tx-uboot.git] / board / gdsys / 405ep / iocon.c

diff --git a/board/gdsys/405ep/iocon.c b/board/gdsys/405ep/iocon.c
index 7a98e41d0aacc2c444030924a5c6a7856184d37f..1bac97027d4b9f794bf7455aa01831daa2b74811 100644 (file)
--- a/board/gdsys/405ep/iocon.c
+++ b/board/gdsys/405ep/iocon.c
@@ -374,11 +374,12 @@ int last_stage_init(void)
 
        FPGA_GET_REG(0, fpga_features, &fpga_features);
 
-       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 */
        for (k = 0; k < ARRAY_SIZE(mclink_controllers); ++k) {
@@ -408,13 +409,16 @@ int last_stage_init(void)
                }
        }
 
-       /* 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;