devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] arm/dts: OMAP3: fix pinctrl-single configuration
@ 2013-03-28  8:08 Christoph Fritz
  2013-03-28 16:38 ` Tony Lindgren
  0 siblings, 1 reply; 7+ messages in thread
From: Christoph Fritz @ 2013-03-28  8:08 UTC (permalink / raw)
  To: Benoît Cousson, Tony Lindgren, linux-omap,
	devicetree-discuss, linux-arm-kernel
  Cc: Daniel Mack, Hans J. Koch

- Fix 'function-mask' referring to TRM Section 7.4.4:
  "Pad Functional Multiplexing and Configuration".
- Fix 'omap3_pmx_core' referring to TRM Table 7-4:
  "Core Control Module Pad Configuration Register Fields"
- Fix 'omap3_pmx_wkup' referring to TRM Table 7-6:
  "Wake-Up Control Module Pad Configuration Register Fields".

Signed-off-by: Christoph Fritz <chf.fritz@googlemail.com>
---
 arch/arm/boot/dts/omap3.dtsi |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
index 1acc261..6ce3b5c 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 {
@@ -77,20 +77,20 @@
 
 		omap3_pmx_core: pinmux@48002030 {
 			compatible = "ti,omap3-padconf", "pinctrl-single";
-			reg = <0x48002030 0x05cc>;
+			reg = <0x48002030 0x234>;
 			#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 0x54>;
 			#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




^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2013-04-09  0:15 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-28  8:08 [PATCH] arm/dts: OMAP3: fix pinctrl-single configuration Christoph Fritz
2013-03-28 16:38 ` Tony Lindgren
2013-03-29  9:37   ` Christoph Fritz
2013-03-29 10:52     ` Christoph Fritz
2013-03-29 15:17     ` Tony Lindgren
2013-03-29 16:32       ` [PATCH v2] " Christoph Fritz
2013-04-09  0:15         ` Tony Lindgren

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).