diff mbox

[U-Boot,11/11] imx: ventana: leave PCI reset de-asserted if PCI enabled

Message ID 1407476151-5603-12-git-send-email-tharvey@gateworks.com
State Awaiting Upstream
Delegated to: Stefano Babic
Headers show

Commit Message

Tim Harvey Aug. 8, 2014, 5:35 a.m. UTC
Signed-off-by: Tim Harvey <tharvey@gateworks.com>
---
 board/gateworks/gw_ventana/gw_ventana.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

Comments

Stefano Babic Aug. 20, 2014, 11:05 a.m. UTC | #1
Hi Tim,

On 08/08/2014 07:35, Tim Harvey wrote:
> Signed-off-by: Tim Harvey <tharvey@gateworks.com>
> ---
>  board/gateworks/gw_ventana/gw_ventana.c | 8 +++-----
>  1 file changed, 3 insertions(+), 5 deletions(-)
> 
> diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c
> index 1c24e4b..70b90d8 100644
> --- a/board/gateworks/gw_ventana/gw_ventana.c
> +++ b/board/gateworks/gw_ventana/gw_ventana.c
> @@ -991,12 +991,10 @@ static void setup_board_gpio(int board)
>  		gpio_direction_output(GP_MSATA_SEL, 0);
>  	}
>  
> -	/*
> -	 * assert PCI_RST# (released by OS when clock is valid)
> -	 * TODO: figure out why leaving this de-asserted from PCI scan on boot
> -	 *       causes linux pcie driver to hang during enumeration
> -	 */
> +#if !defined(CONFIG_CMD_PCI)
> +	/* assert PCI_RST# (released by OS when clock is valid) */
>  	gpio_direction_output(gpio_cfg[board].pcie_rst, 0);
> +#endif
>  
>  	/* turn off (active-high) user LED's */
>  	for (i = 0; i < 4; i++) {
> 

Applied to u-boot-imx, thanks !

Best regards,
Stefano Babic
diff mbox

Patch

diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c
index 1c24e4b..70b90d8 100644
--- a/board/gateworks/gw_ventana/gw_ventana.c
+++ b/board/gateworks/gw_ventana/gw_ventana.c
@@ -991,12 +991,10 @@  static void setup_board_gpio(int board)
 		gpio_direction_output(GP_MSATA_SEL, 0);
 	}
 
-	/*
-	 * assert PCI_RST# (released by OS when clock is valid)
-	 * TODO: figure out why leaving this de-asserted from PCI scan on boot
-	 *       causes linux pcie driver to hang during enumeration
-	 */
+#if !defined(CONFIG_CMD_PCI)
+	/* assert PCI_RST# (released by OS when clock is valid) */
 	gpio_direction_output(gpio_cfg[board].pcie_rst, 0);
+#endif
 
 	/* turn off (active-high) user LED's */
 	for (i = 0; i < 4; i++) {