summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurz <akurz@blala.de>2017-03-19 18:02:10 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2017-03-20 08:33:00 +0100
commit82c065d276a7ca98c9032cf58fa4f308b864f9b9 (patch)
tree4b1a12a877ff2d3c0cb869900df6ac5509dbcedd
parentd711adeec81eaa5fbbb195e07741e0325f34ecd1 (diff)
downloadbarebox-82c065d276a7ca98c9032cf58fa4f308b864f9b9.tar.gz
barebox-82c065d276a7ca98c9032cf58fa4f308b864f9b9.tar.xz
ARM: dts: i.MX7 WaRP7: remove wdog1 pinctrl workaround
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@blala.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/arm/dts/imx7s-warp.dts17
1 files changed, 0 insertions, 17 deletions
diff --git a/arch/arm/dts/imx7s-warp.dts b/arch/arm/dts/imx7s-warp.dts
index a59823da02..c2db0d8ae0 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
- >;
- };
-};