From: Tim Harvey <tharvey@gateworks.com>
Date: Mon, 15 May 2017 17:05:06 +0000 (-0700)
Subject: imx: ventana: fix GW520x external watchdog dt update
X-Git-Tag: v2017.07-rc1~248^2~15
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=27388d561c77592914f3510119ac406371420670;p=u-boot

imx: ventana: fix GW520x external watchdog dt update

Signed-off-by: Tim Harvey <tharvey@gateworks.com>
---

diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c
index c4c2d23532..c26807d4c2 100644
--- a/board/gateworks/gw_ventana/gw_ventana.c
+++ b/board/gateworks/gw_ventana/gw_ventana.c
@@ -1203,16 +1203,16 @@ int ft_board_setup(void *blob, bd_t *bd)
 			    strstr((const char *)info->model, "SP331-B"))
 				gpio_cfg[board_type].usd_vsel = 0;
 
-			/* GW520x-E adds WDOG1_B external reset */
-			if (info->model[4] == '0' && rev < 'E')
-				ft_delprop_path(blob, WDOG1_PATH,
-						"fsl,ext-reset-output");
-
 			/* GW522x-B adds WDOG1_B external reset */
-			if (info->model[4] == '2' && rev < 'B')
-				ft_delprop_path(blob, WDOG1_PATH,
-						"fsl,ext-reset-output");
+			ft_delprop_path(blob, WDOG1_PATH,
+					"fsl,ext-reset-output");
 		}
+
+		/* GW520x-E adds WDOG1_B external reset */
+		else if (info->model[4] == '0' && rev < 'E')
+			ft_delprop_path(blob, WDOG1_PATH,
+					"fsl,ext-reset-output");
+
 		break;
 
 	case GW53xx: