All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tony Lindgren <tony@atomide.com>
To: Christoph Fritz <chf.fritz@googlemail.com>
Cc: "Benoît Cousson" <b-cousson@ti.com>,
	linux-omap@vger.kernel.org, devicetree-discuss@lists.ozlabs.org,
	linux-arm-kernel@lists.infradead.org,
	"Daniel Mack" <daniel@zonque.org>,
	"Hans J. Koch" <hjk@hansjkoch.de>
Subject: Re: [PATCH v2] arm/dts: OMAP3: fix pinctrl-single configuration
Date: Mon, 8 Apr 2013 17:15:30 -0700	[thread overview]
Message-ID: <20130409001530.GI10155@atomide.com> (raw)
In-Reply-To: <1364574725.4634.51.camel@mars>

* Christoph Fritz <chf.fritz@googlemail.com> [130329 09:36]:
>  - Fix 'function-mask' referring to TRM (Omap 36xx) Section 13.4.4:
>    "Pad Functional Multiplexing and Configuration".
>  - Fix 'omap3_pmx_wkup' referring to TRM Table 13-6:
>    "Wkup Control Module Pad Configuration Register Fields".

Thanks applying into omap-for-v3.10/dt on top of the patches
queued by Benoit.

Tony
 
> Signed-off-by: Christoph Fritz <chf.fritz@googlemail.com>
> ---
>  arch/arm/boot/dts/omap3.dtsi |   10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
> index 1acc261..1997b41 100644
> --- a/arch/arm/boot/dts/omap3.dtsi
> +++ b/arch/arm/boot/dts/omap3.dtsi
> @@ -27,7 +27,7 @@
>  	};
>  
>  	/*
> -	 * The soc node represents the soc top level view. It is uses for IPs
> +	 * The soc node represents the soc top level view. It is used for IPs
>  	 * that are not memory mapped in the MPU view or for the MPU itself.
>  	 */
>  	soc {
> @@ -81,16 +81,16 @@
>  			#address-cells = <1>;
>  			#size-cells = <0>;
>  			pinctrl-single,register-width = <16>;
> -			pinctrl-single,function-mask = <0x7fff>;
> +			pinctrl-single,function-mask = <0x7f1f>;
>  		};
>  
> -		omap3_pmx_wkup: pinmux@0x48002a58 {
> +		omap3_pmx_wkup: pinmux@0x48002a00 {
>  			compatible = "ti,omap3-padconf", "pinctrl-single";
> -			reg = <0x48002a58 0x5c>;
> +			reg = <0x48002a00 0x5c>;
>  			#address-cells = <1>;
>  			#size-cells = <0>;
>  			pinctrl-single,register-width = <16>;
> -			pinctrl-single,function-mask = <0x7fff>;
> +			pinctrl-single,function-mask = <0x7f1f>;
>  		};
>  
>  		gpio1: gpio@48310000 {
> -- 
> 1.7.10.4
> 
> 
> 

WARNING: multiple messages have this Message-ID (diff)
From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2] arm/dts: OMAP3: fix pinctrl-single configuration
Date: Mon, 8 Apr 2013 17:15:30 -0700	[thread overview]
Message-ID: <20130409001530.GI10155@atomide.com> (raw)
In-Reply-To: <1364574725.4634.51.camel@mars>

* Christoph Fritz <chf.fritz@googlemail.com> [130329 09:36]:
>  - Fix 'function-mask' referring to TRM (Omap 36xx) Section 13.4.4:
>    "Pad Functional Multiplexing and Configuration".
>  - Fix 'omap3_pmx_wkup' referring to TRM Table 13-6:
>    "Wkup Control Module Pad Configuration Register Fields".

Thanks applying into omap-for-v3.10/dt on top of the patches
queued by Benoit.

Tony
 
> Signed-off-by: Christoph Fritz <chf.fritz@googlemail.com>
> ---
>  arch/arm/boot/dts/omap3.dtsi |   10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
> index 1acc261..1997b41 100644
> --- a/arch/arm/boot/dts/omap3.dtsi
> +++ b/arch/arm/boot/dts/omap3.dtsi
> @@ -27,7 +27,7 @@
>  	};
>  
>  	/*
> -	 * The soc node represents the soc top level view. It is uses for IPs
> +	 * The soc node represents the soc top level view. It is used for IPs
>  	 * that are not memory mapped in the MPU view or for the MPU itself.
>  	 */
>  	soc {
> @@ -81,16 +81,16 @@
>  			#address-cells = <1>;
>  			#size-cells = <0>;
>  			pinctrl-single,register-width = <16>;
> -			pinctrl-single,function-mask = <0x7fff>;
> +			pinctrl-single,function-mask = <0x7f1f>;
>  		};
>  
> -		omap3_pmx_wkup: pinmux at 0x48002a58 {
> +		omap3_pmx_wkup: pinmux at 0x48002a00 {
>  			compatible = "ti,omap3-padconf", "pinctrl-single";
> -			reg = <0x48002a58 0x5c>;
> +			reg = <0x48002a00 0x5c>;
>  			#address-cells = <1>;
>  			#size-cells = <0>;
>  			pinctrl-single,register-width = <16>;
> -			pinctrl-single,function-mask = <0x7fff>;
> +			pinctrl-single,function-mask = <0x7f1f>;
>  		};
>  
>  		gpio1: gpio at 48310000 {
> -- 
> 1.7.10.4
> 
> 
> 

  reply	other threads:[~2013-04-09  0:15 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-28  8:08 [PATCH] arm/dts: OMAP3: fix pinctrl-single configuration Christoph Fritz
2013-03-28  8:08 ` Christoph Fritz
2013-03-28 16:38 ` Tony Lindgren
2013-03-28 16:38   ` Tony Lindgren
2013-03-29  9:37   ` Christoph Fritz
2013-03-29  9:37     ` Christoph Fritz
2013-03-29 10:52     ` Christoph Fritz
2013-03-29 10:52       ` Christoph Fritz
2013-03-29 15:17     ` Tony Lindgren
2013-03-29 15:17       ` Tony Lindgren
2013-03-29 16:32       ` [PATCH v2] " Christoph Fritz
2013-03-29 16:32         ` Christoph Fritz
2013-04-09  0:15         ` Tony Lindgren [this message]
2013-04-09  0:15           ` Tony Lindgren

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=20130409001530.GI10155@atomide.com \
    --to=tony@atomide.com \
    --cc=b-cousson@ti.com \
    --cc=chf.fritz@googlemail.com \
    --cc=daniel@zonque.org \
    --cc=devicetree-discuss@lists.ozlabs.org \
    --cc=hjk@hansjkoch.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-omap@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.