mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Alexander Kurz <akurz@blala.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH] ARM: dts: i.MX7 WaRP7: remove wdog1 pinctrl workaround
Date: Mon, 20 Mar 2017 08:33:13 +0100	[thread overview]
Message-ID: <20170320073313.66bibqorbi35xdgd@pengutronix.de> (raw)
In-Reply-To: <1489942930-16229-1-git-send-email-akurz@blala.de>

On Sun, Mar 19, 2017 at 06:02:10PM +0100, Alexander Kurz wrote:
> 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(-)

Applied, thanks

Sascha

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

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

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

      reply	other threads:[~2017-03-20  7:33 UTC|newest]

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

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=20170320073313.66bibqorbi35xdgd@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=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