Skip to contentSkip to conversation

arm/dts: OMAP3: fix pinctrl-single configuration

PATCH New Christoph Fritz 2 participants 7 messages Mar 28, 2013 – Apr 9, 2013 Device tree bindings

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm/dts: OMAP3: fix pinctrl-single configuration

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

---
 arch/arm/boot/dts/omap3.dtsi |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
arch/arm/boot/dts/omap3.dtsi +6 -6
index 1acc261..6ce3b5c 100644
@@ -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 at 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 at 0x48002a58 {
+		omap3_pmx_wkup: pinmux at 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 at 48310000 {
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 1/1 arm/dts: OMAP3: fix pinctrl-single configuration

Quoted 6 lines · Christoph Fritz

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

Maybe mention which TRM this is so people will know.

Quoted 20 lines
---
 arch/arm/boot/dts/omap3.dtsi |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
arch/arm/boot/dts/omap3.dtsi +1 -1
index 1acc261..6ce3b5c 100644
@@ -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 @@
 

arch/arm/boot/dts/omap3.dtsi line 85

Quoted 10 lines
arch/arm/boot/dts/omap3.dtsi +2 -2
 		omap3_pmx_core: pinmux at 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>;
 		};

Changing the size from 0x5cc to 0x234 misses the range ending at CONTROL_PADCONF_ETK_D14[31:16] 0x480025f8 that's listed at least in the 3630 TRM. Which TRM are you looking at?

Ack for the function-mask change for omap3, looks like those bits are not used.

arch/arm/boot/dts/omap3.dtsi line 94

Quoted 11 lines
arch/arm/boot/dts/omap3.dtsi +3 -3
-		omap3_pmx_wkup: pinmux at 0x48002a58 {
+		omap3_pmx_wkup: pinmux at 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>;
 		};

Hmm I think I converted these from the legacy mux framework, that seems to be missing the wkup range between 0x2a00 - 0x2a58. So yes 0x2a00 is the right start as otherwise we're missing some wkup registers.

But the size should be 0x50 instead of 0x54 as the JTAG_TDO[31:16] is already un-used in TRM?

Or it could be 0x60 if we want to map also the reserved GPIO128[31:16].

Regards,

Tony

#2 lore raw

PATCH 1/1 arm/dts: OMAP3: fix pinctrl-single configuration

Quoted 30 lines · Tony Lindgren
Quoted 6 lines · Christoph Fritz

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

Maybe mention which TRM this is so people will know.

Quoted 20 lines
---
 arch/arm/boot/dts/omap3.dtsi |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
arch/arm/boot/dts/omap3.dtsi +1 -1
index 1acc261..6ce3b5c 100644
@@ -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 @@
 
Quoted 14 lines

arch/arm/boot/dts/omap3.dtsi line 85

Quoted 10 lines
arch/arm/boot/dts/omap3.dtsi +2 -2
 		omap3_pmx_core: pinmux at 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>;
 		};

Changing the size from 0x5cc to 0x234 misses the range ending at CONTROL_PADCONF_ETK_D14[31:16] 0x480025f8 that's listed at least in the 3630 TRM. Which TRM are you looking at?

I used TRM Omap35xx, and yes in the TRM Omap36xx 0x234 is fine. I'll fix this in the next revision of this patch.

Quoted 19 lines

Ack for the function-mask change for omap3, looks like those bits are not used.

arch/arm/boot/dts/omap3.dtsi line 94

Quoted 11 lines
arch/arm/boot/dts/omap3.dtsi +3 -3
-		omap3_pmx_wkup: pinmux at 0x48002a58 {
+		omap3_pmx_wkup: pinmux at 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>;
 		};

Hmm I think I converted these from the legacy mux framework, that seems to be missing the wkup range between 0x2a00 - 0x2a58. So yes 0x2a00 is the right start as otherwise we're missing some wkup registers.

Quoted 4 lines

But the size should be 0x50 instead of 0x54 as the JTAG_TDO[31:16] is already un-used in TRM?

Or it could be 0x60 if we want to map also the reserved GPIO128[31:16].

Why not 0x5c ? GPIO128[31:16] starts at 0x2a5a and its size is 2 bytes.

Thanks
-- Christoph

#3 lore raw

PATCH 1/1 arm/dts: OMAP3: fix pinctrl-single configuration

Quoted 46 lines · Christoph Fritz
Quoted 30 lines · Tony Lindgren
Quoted 6 lines · Christoph Fritz

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

Maybe mention which TRM this is so people will know.

Quoted 20 lines
---
 arch/arm/boot/dts/omap3.dtsi |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
arch/arm/boot/dts/omap3.dtsi +1 -1
index 1acc261..6ce3b5c 100644
@@ -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 @@
 
Quoted 14 lines

arch/arm/boot/dts/omap3.dtsi line 85

Quoted 10 lines
arch/arm/boot/dts/omap3.dtsi +2 -2
 		omap3_pmx_core: pinmux at 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>;
 		};

Changing the size from 0x5cc to 0x234 misses the range ending at CONTROL_PADCONF_ETK_D14[31:16] 0x480025f8 that's listed at least in the 3630 TRM. Which TRM are you looking at?

Quoted 2 lines

I used TRM Omap35xx, and yes in the TRM Omap36xx 0x234 is fine. I'll fix this in the next revision of this patch.

I mean 0x5cc is fine :)

Quoted 30 lines
Quoted 20 lines

Ack for the function-mask change for omap3, looks like those bits are not used.

arch/arm/boot/dts/omap3.dtsi line 94

Quoted 11 lines
arch/arm/boot/dts/omap3.dtsi +3 -3
-		omap3_pmx_wkup: pinmux at 0x48002a58 {
+		omap3_pmx_wkup: pinmux at 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>;
 		};

Hmm I think I converted these from the legacy mux framework, that seems to be missing the wkup range between 0x2a00 - 0x2a58. So yes 0x2a00 is the right start as otherwise we're missing some wkup registers.

Quoted 4 lines

But the size should be 0x50 instead of 0x54 as the JTAG_TDO[31:16] is already un-used in TRM?

Or it could be 0x60 if we want to map also the reserved GPIO128[31:16].

Why not 0x5c ? GPIO128[31:16] starts at 0x2a5a and its size is 2 bytes.

Thanks
-- Christoph

#4 lore raw

PATCH 1/1 arm/dts: OMAP3: fix pinctrl-single configuration

In reply to Christoph Fritz
Quoted 46 lines · Christoph Fritz
Quoted 30 lines · Tony Lindgren
Quoted 6 lines · Christoph Fritz

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

Maybe mention which TRM this is so people will know.

Quoted 20 lines
---
 arch/arm/boot/dts/omap3.dtsi |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
arch/arm/boot/dts/omap3.dtsi +1 -1
index 1acc261..6ce3b5c 100644
@@ -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 @@
 
Quoted 14 lines

arch/arm/boot/dts/omap3.dtsi line 85

Quoted 10 lines
arch/arm/boot/dts/omap3.dtsi +2 -2
 		omap3_pmx_core: pinmux at 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>;
 		};

Changing the size from 0x5cc to 0x234 misses the range ending at CONTROL_PADCONF_ETK_D14[31:16] 0x480025f8 that's listed at least in the 3630 TRM. Which TRM are you looking at?

Quoted 2 lines

I used TRM Omap35xx, and yes in the TRM Omap36xx 0x234 is fine. I'll fix this in the next revision of this patch.

OK

Quoted 19 lines
Quoted 19 lines

Ack for the function-mask change for omap3, looks like those bits are not used.

arch/arm/boot/dts/omap3.dtsi line 94

Quoted 11 lines
arch/arm/boot/dts/omap3.dtsi +3 -3
-		omap3_pmx_wkup: pinmux at 0x48002a58 {
+		omap3_pmx_wkup: pinmux at 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>;
 		};

Hmm I think I converted these from the legacy mux framework, that seems to be missing the wkup range between 0x2a00 - 0x2a58. So yes 0x2a00 is the right start as otherwise we're missing some wkup registers.

Quoted 6 lines
Quoted 4 lines

But the size should be 0x50 instead of 0x54 as the JTAG_TDO[31:16] is already un-used in TRM?

Or it could be 0x60 if we want to map also the reserved GPIO128[31:16].

Why not 0x5c ? GPIO128[31:16] starts at 0x2a5a and its size is 2 bytes.

Oops yes 0x5c as it's 2 bytes. So the original value is fine then.

Regards,

Tony

#5 lore raw

PATCH v2 1/1 arm/dts: OMAP3: fix pinctrl-single configuration

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

---
 arch/arm/boot/dts/omap3.dtsi |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
arch/arm/boot/dts/omap3.dtsi +5 -5
index 1acc261..1997b41 100644
@@ -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 {
Signature · 1 line
1.7.10.4
#6 lore raw

PATCH v2 1/1 arm/dts: OMAP3: fix pinctrl-single configuration

Quoted 4 lines · Christoph Fritz

- 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

Quoted 44 lines
---
 arch/arm/boot/dts/omap3.dtsi |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
arch/arm/boot/dts/omap3.dtsi +5 -5
index 1acc261..1997b41 100644
@@ -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 {
Signature · 1 line
1.7.10.4