From 82c065d276a7ca98c9032cf58fa4f308b864f9b9 Mon Sep 17 00:00:00 2001 From: Alexander Kurz Date: Sun, 19 Mar 2017 18:02:10 +0100 Subject: 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 Signed-off-by: Sascha Hauer --- arch/arm/dts/imx7s-warp.dts | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'arch/arm/dts/imx7s-warp.dts') 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 - >; - }; -}; -- cgit v1.2.3