Skip to contentSkip to conversation

ARM: dts: stm32: Fix STM32MP13xx pinmux node eth2-rgmii-sleep-0 copy-paste error

PATCH In review Marek Vasut 2 participants 3 messages Jun 26, 2024 – Jun 27, 2024

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: dts: stm32: Fix STM32MP13xx pinmux node eth2-rgmii-sleep-0 copy-paste error

Fix pin copy-paste error in STM32MP13xx eth2-rgmii-sleep-0 pinmux node. Clearly the pins like PG11 are not supposed to be duplicated in the node pinmux property, fix them up to match the hardware pin assignment.

Fixes d1193e65647e ("ARM: dts: stm32: Add pinmux nodes for DH electronics STM32MP13xx DHCOR SoM and DHSBC board")

---
Cc: Alexandre Torgue <[email protected]>
Cc: Christophe Roullier <[email protected]>
Cc: Conor Dooley <[email protected]>
Cc: Krzysztof Kozlowski <[email protected]>
Cc: Maxime Coquelin <[email protected]>
Cc: Rob Herring <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]

---
 arch/arm/boot/dts/st/stm32mp13-pinctrl.dtsi | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
arch/arm/boot/dts/st/stm32mp13-pinctrl.dtsi +7 -7
index 42995a8f5034c..9c7cf8f3c3e8b 100644
@@ -157,16 +157,16 @@ eth2_rgmii_sleep_pins_a: eth2-rgmii-sleep-0 {
 		pins1 {
 			pinmux = <STM32_PINMUX('F', 7, ANALOG)>, /* ETH_RGMII_TXD0 */
 				 <STM32_PINMUX('G', 11, ANALOG)>, /* ETH_RGMII_TXD1 */
-				 <STM32_PINMUX('G', 11, ANALOG)>, /* ETH_RGMII_TXD2 */
-				 <STM32_PINMUX('G', 11, ANALOG)>, /* ETH_RGMII_TXD3 */
-				 <STM32_PINMUX('G', 8, ANALOG)>, /* ETH_RGMII_TX_CTL */
-				 <STM32_PINMUX('F', 6, ANALOG)>, /* ETH_RGMII_GTX_CLK */
-				 <STM32_PINMUX('B', 2, ANALOG)>, /* ETH_MDIO */
+				 <STM32_PINMUX('G', 1, ANALOG)>, /* ETH_RGMII_TXD2 */
+				 <STM32_PINMUX('E', 6, ANALOG)>, /* ETH_RGMII_TXD3 */
+				 <STM32_PINMUX('F', 6, ANALOG)>, /* ETH_RGMII_TX_CTL */
+				 <STM32_PINMUX('G', 3, ANALOG)>, /* ETH_RGMII_GTX_CLK */
+				 <STM32_PINMUX('B', 6, ANALOG)>, /* ETH_MDIO */
 				 <STM32_PINMUX('G', 5, ANALOG)>, /* ETH_MDC */
 				 <STM32_PINMUX('F', 4, ANALOG)>, /* ETH_RGMII_RXD0 */
 				 <STM32_PINMUX('E', 2, ANALOG)>, /* ETH_RGMII_RXD1 */
-				 <STM32_PINMUX('E', 2, ANALOG)>, /* ETH_RGMII_RXD2 */
-				 <STM32_PINMUX('E', 2, ANALOG)>, /* ETH_RGMII_RXD3 */
+				 <STM32_PINMUX('H', 6, ANALOG)>, /* ETH_RGMII_RXD2 */
+				 <STM32_PINMUX('A', 8, ANALOG)>, /* ETH_RGMII_RXD3 */
 				 <STM32_PINMUX('A', 12, ANALOG)>, /* ETH_RGMII_RX_CTL */
 				 <STM32_PINMUX('H', 11, ANALOG)>; /* ETH_RGMII_RX_CLK */
 		};
Signature · 1 line
2.43.0
maintainer
#1 lore raw

Hi Marek

Quoted 40 lines · Marek Vasut

Fix pin copy-paste error in STM32MP13xx eth2-rgmii-sleep-0 pinmux node. Clearly the pins like PG11 are not supposed to be duplicated in the node pinmux property, fix them up to match the hardware pin assignment.

Fixes d1193e65647e ("ARM: dts: stm32: Add pinmux nodes for DH electronics STM32MP13xx DHCOR SoM and DHSBC board")

---
Cc: Alexandre Torgue <[email protected]>
Cc: Christophe Roullier <[email protected]>
Cc: Conor Dooley <[email protected]>
Cc: Krzysztof Kozlowski <[email protected]>
Cc: Maxime Coquelin <[email protected]>
Cc: Rob Herring <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]

---
  arch/arm/boot/dts/st/stm32mp13-pinctrl.dtsi | 14 +++++++-------
  1 file changed, 7 insertions(+), 7 deletions(-)
arch/arm/boot/dts/st/stm32mp13-pinctrl.dtsi +5 -5
index 42995a8f5034c..9c7cf8f3c3e8b 100644
@@ -157,16 +157,16 @@ eth2_rgmii_sleep_pins_a: eth2-rgmii-sleep-0 {
  		pins1 {
  			pinmux = <STM32_PINMUX('F', 7, ANALOG)>, /* ETH_RGMII_TXD0 */
  				 <STM32_PINMUX('G', 11, ANALOG)>, /* ETH_RGMII_TXD1 */
-				 <STM32_PINMUX('G', 11, ANALOG)>, /* ETH_RGMII_TXD2 */
-				 <STM32_PINMUX('G', 11, ANALOG)>, /* ETH_RGMII_TXD3 */
-				 <STM32_PINMUX('G', 8, ANALOG)>, /* ETH_RGMII_TX_CTL */
-				 <STM32_PINMUX('F', 6, ANALOG)>, /* ETH_RGMII_GTX_CLK */
-				 <STM32_PINMUX('B', 2, ANALOG)>, /* ETH_MDIO */
+				 <STM32_PINMUX('G', 1, ANALOG)>, /* ETH_RGMII_TXD2 */
+				 <STM32_PINMUX('E', 6, ANALOG)>, /* ETH_RGMII_TXD3 */
+				 <STM32_PINMUX('F', 6, ANALOG)>, /* ETH_RGMII_TX_CTL */
+				 <STM32_PINMUX('G', 3, ANALOG)>, /* ETH_RGMII_GTX_CLK */
+				 <STM32_PINMUX('B', 6, ANALOG)>, /* ETH_MDIO */

arch/arm/boot/dts/st/stm32mp13-pinctrl.dtsi eth2_rgmii_sleep_pins_a: eth2-rgmii-sleep-0 { · line 172

Quoted 10 lines
arch/arm/boot/dts/st/stm32mp13-pinctrl.dtsi +2 -2
  				 <STM32_PINMUX('G', 5, ANALOG)>, /* ETH_MDC */
  				 <STM32_PINMUX('F', 4, ANALOG)>, /* ETH_RGMII_RXD0 */
  				 <STM32_PINMUX('E', 2, ANALOG)>, /* ETH_RGMII_RXD1 */
-				 <STM32_PINMUX('E', 2, ANALOG)>, /* ETH_RGMII_RXD2 */
-				 <STM32_PINMUX('E', 2, ANALOG)>, /* ETH_RGMII_RXD3 */
+				 <STM32_PINMUX('H', 6, ANALOG)>, /* ETH_RGMII_RXD2 */
+				 <STM32_PINMUX('A', 8, ANALOG)>, /* ETH_RGMII_RXD3 */
  				 <STM32_PINMUX('A', 12, ANALOG)>, /* ETH_RGMII_RX_CTL */
  				 <STM32_PINMUX('H', 11, ANALOG)>; /* ETH_RGMII_RX_CLK */
  		};

Applied on stm32-next. I think I'll squash the two fixes (this patch and the other one for the makefile) onto the initial patch when I create my PR vor v6.11.

Regards
Alex

#2 lore raw
Quoted 47 lines · Alexandre TORGUE

Hi Marek

Quoted 44 lines · Marek Vasut

Fix pin copy-paste error in STM32MP13xx eth2-rgmii-sleep-0 pinmux node. Clearly the pins like PG11 are not supposed to be duplicated in the node pinmux property, fix them up to match the hardware pin assignment.

Fixes d1193e65647e ("ARM: dts: stm32: Add pinmux nodes for DH electronics STM32MP13xx DHCOR SoM and DHSBC board")

---
Cc: Alexandre Torgue <[email protected]>
Cc: Christophe Roullier <[email protected]>
Cc: Conor Dooley <[email protected]>
Cc: Krzysztof Kozlowski <[email protected]>
Cc: Maxime Coquelin <[email protected]>
Cc: Rob Herring <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
---
  arch/arm/boot/dts/st/stm32mp13-pinctrl.dtsi | 14 +++++++-------

  1 file changed, 7 insertions(+), 7 deletions(-)
arch/arm/boot/dts/st/stm32mp13-pinctrl.dtsi +0 -0
index 42995a8f5034c..9c7cf8f3c3e8b 100644
@@ -157,16 +157,16 @@ eth2_rgmii_sleep_pins_a: eth2-rgmii-sleep-0 {
           pins1 {

              pinmux = <STM32_PINMUX('F', 7, ANALOG)>, /* ETH_RGMII_TXD0 */ <STM32_PINMUX('G', 11, ANALOG)>, /* ETH_RGMII_TXD1 */ -                 <STM32_PINMUX('G', 11, ANALOG)>, /* ETH_RGMII_TXD2 */ -                 <STM32_PINMUX('G', 11, ANALOG)>, /* ETH_RGMII_TXD3 */ -                 <STM32_PINMUX('G', 8, ANALOG)>, /* ETH_RGMII_TX_CTL */ -                 <STM32_PINMUX('F', 6, ANALOG)>, /* ETH_RGMII_GTX_CLK */ -                 <STM32_PINMUX('B', 2, ANALOG)>, /* ETH_MDIO */ +                 <STM32_PINMUX('G', 1, ANALOG)>, /* ETH_RGMII_TXD2 */ +                 <STM32_PINMUX('E', 6, ANALOG)>, /* ETH_RGMII_TXD3 */ +                 <STM32_PINMUX('F', 6, ANALOG)>, /* ETH_RGMII_TX_CTL */ +                 <STM32_PINMUX('G', 3, ANALOG)>, /* ETH_RGMII_GTX_CLK */ +                 <STM32_PINMUX('B', 6, ANALOG)>, /* ETH_MDIO */ <STM32_PINMUX('G', 5, ANALOG)>, /* ETH_MDC */ <STM32_PINMUX('F', 4, ANALOG)>, /* ETH_RGMII_RXD0 */ <STM32_PINMUX('E', 2, ANALOG)>, /* ETH_RGMII_RXD1 */ -                 <STM32_PINMUX('E', 2, ANALOG)>, /* ETH_RGMII_RXD2 */

Quoted 8 lines
Quoted 6 lines

-                 <STM32_PINMUX('E', 2, ANALOG)>, /* ETH_RGMII_RXD3 */ +                 <STM32_PINMUX('H', 6, ANALOG)>, /* ETH_RGMII_RXD2 */ +                 <STM32_PINMUX('A', 8, ANALOG)>, /* ETH_RGMII_RXD3 */ <STM32_PINMUX('A', 12, ANALOG)>, /* ETH_RGMII_RX_CTL */ <STM32_PINMUX('H', 11, ANALOG)>; /* ETH_RGMII_RX_CLK */ };

Applied on stm32-next. I think I'll squash the two fixes (this patch and the other one for the makefile) onto the initial patch when I create my PR vor v6.11.

Fine by me, thanks !