summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDirk Eibach <dirk.eibach@gdsys.cc>2015-10-28 11:46:34 +0100
committerTom Rini <trini@konsulko.com>2015-11-12 18:04:09 -0500
commitb847f5b622e3d2e98a0164753c2890843bc0d93e (patch)
treedc7ac2e8807ccc30e634b76cce415db90809b0f8
parentd4e58888014135e429bb8c7b39655106e99b6477 (diff)
downloadblackbird-obmc-uboot-b847f5b622e3d2e98a0164753c2890843bc0d93e.tar.gz
blackbird-obmc-uboot-b847f5b622e3d2e98a0164753c2890843bc0d93e.zip
hrcon: Fix videoboard i2c setup
- i2c addresses for the videoboard port expanders were wrong. - the fpga reset signal was not initialized. Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc>
-rw-r--r--board/gdsys/mpc8308/hrcon.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/board/gdsys/mpc8308/hrcon.c b/board/gdsys/mpc8308/hrcon.c
index 29c85c897e..5492718c52 100644
--- a/board/gdsys/mpc8308/hrcon.c
+++ b/board/gdsys/mpc8308/hrcon.c
@@ -119,7 +119,7 @@ int last_stage_init(void)
int slaves;
unsigned int k;
unsigned int mux_ch;
- unsigned char mclink_controllers[] = { 0x24, 0x25, 0x26 };
+ unsigned char mclink_controllers[] = { 0x3c, 0x3d, 0x3e };
u16 fpga_features;
bool hw_type_cat = pca9698_get_value(0x20, 20);
bool ch0_rgmii2_present = false;
@@ -131,7 +131,7 @@ int last_stage_init(void)
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;
@@ -146,6 +146,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 (hw_type_cat) {
OpenPOWER on IntegriCloud