[PATCH] ARM: dts: i.MX7 WaRP7: remove wdog1 pinctrl workaround

Alexander Kurz akurz at blala.de
Sun Mar 19 10:02:10 PDT 2017


The wdog1 pinctrl got fixed with linux upstream commit 213e51ca8df1 ("ARM:
dts: imx7: Add "LPSR" to LPSR iomux pin names").
Remove the old workaround, since it triggers a build error.

Signed-off-by: Alexander Kurz <akurz at blala.de>
---
 arch/arm/dts/imx7s-warp.dts | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/arch/arm/dts/imx7s-warp.dts b/arch/arm/dts/imx7s-warp.dts
index a59823d..c2db0d8 100644
--- a/arch/arm/dts/imx7s-warp.dts
+++ b/arch/arm/dts/imx7s-warp.dts
@@ -43,20 +43,3 @@
 		};
 	};
 };
-
-/*
-/* The watchdog pinctrl is attached to the wrong iomux controller in
- * the upstream dts file. This can be removed once we pull in the
- * corresponding fix from the upstream dts files.
- */
-&wdog1 {
-	pinctrl-0 = <&pinctrl_wdog_lpsr>;
-};
-
-&iomuxc_lpsr {
-	pinctrl_wdog_lpsr: wdoggrp {
-		fsl,pins = <
-			MX7D_PAD_GPIO1_IO00__WDOD1_WDOG_B       0x74
-		>;
-	};
-};
-- 
2.1.4




More information about the barebox mailing list