mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Alexander Kurz <akurz@blala.de>
To: barebox@lists.infradead.org
Cc: Alexander Kurz <akurz@blala.de>
Subject: [PATCH] ARM: dts: i.MX7 WaRP7: remove wdog1 pinctrl workaround
Date: Sun, 19 Mar 2017 18:02:10 +0100	[thread overview]
Message-ID: <1489942930-16229-1-git-send-email-akurz@blala.de> (raw)

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>
---
 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


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

             reply	other threads:[~2017-03-19 17:03 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-19 17:02 Alexander Kurz [this message]
2017-03-20  7:33 ` Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1489942930-16229-1-git-send-email-akurz@blala.de \
    --to=akurz@blala.de \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox