diff options
| author | Tim Harvey <tharvey@gateworks.com> | 2015-05-08 18:28:34 -0700 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2015-05-15 19:21:25 +0200 |
| commit | 77c550189369eeb82f2a67681b343dea68809e62 (patch) | |
| tree | a1e39f8734eb86d7c277c9b3dfc75881012002f5 /board/gateworks | |
| parent | 9ec3c8d4b03c5af5eadb8447a6aa108967a08943 (diff) | |
| download | blackbird-obmc-uboot-77c550189369eeb82f2a67681b343dea68809e62.tar.gz blackbird-obmc-uboot-77c550189369eeb82f2a67681b343dea68809e62.zip | |
imx: ventana: default msata/pci mux to pci before PCI enumeration
PCI enumeration occurs early, before we fully configure our GPIO's. Make
sure we steer the MSATA/PCI mux to PCI in board_init to ensure PCI is
selected before enumeration.
Signed-off-by: Tim Harvey <tharvey@gateworks.com>
Diffstat (limited to 'board/gateworks')
| -rw-r--r-- | board/gateworks/gw_ventana/gw_ventana.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c index 8cfc1f2d5a..cf866ca472 100644 --- a/board/gateworks/gw_ventana/gw_ventana.c +++ b/board/gateworks/gw_ventana/gw_ventana.c @@ -1174,13 +1174,10 @@ static void setup_board_gpio(int board) gpio_direction_output(GP_RS232_EN, (hwconfig("rs232")) ? 0 : 1); /* MSATA Enable */ - gpio_request(GP_MSATA_SEL, "msata_en"); if (is_cpu_type(MXC_CPU_MX6Q) && test_bit(EECONFIG_SATA, info->config)) { gpio_direction_output(GP_MSATA_SEL, (hwconfig("msata")) ? 1 : 0); - } else { - gpio_direction_output(GP_MSATA_SEL, 0); } #if !defined(CONFIG_CMD_PCI) @@ -1435,6 +1432,10 @@ int board_init(void) /* GW522x Uses GPIO3_IO23 for PCIE_RST# */ if (board_type == GW52xx && ventana_info.model[4] == '2') gpio_cfg[board_type].pcie_rst = IMX_GPIO_NR(3, 23); + + /* MSATA Enable - default to PCI */ + gpio_request(GP_MSATA_SEL, "msata_en"); + gpio_direction_output(GP_MSATA_SEL, 0); } return 0; |
