[PATCH 1/5] arm64: dts: st: Add st,io-sync into eth2_rgmii_pins_b

[PATCH 1/5] arm64: dts: st: Add st,io-sync into eth2_rgmii_pins_b

[Marek Vasut]

Add st,io-sync into eth2_rgmii_pins_b to configure the RGMII data pins
for DDR operation. This pinmux is used on DH electronics STM32MP23xx
and STM32MP25xx DHCOS DHSBC.

Fixes: e2fce4620933 ("arm64: dts: st: Add pinmux nodes for DH electronics STM32MP23xx/STM32MP25xx DHCOS SoM and Breakout Board")
Signed-off-by: Marek Vasut <marex@nabladev.com>
---
Cc: Alexandre Torgue <alexandre.torgue@foss.st.com>
Cc: Bartosz Golaszewski <brgl@kernel.org>
Cc: Conor Dooley <conor+dt@kernel.org>
Cc: Krzysztof Kozlowski <krzk+dt@kernel.org>
Cc: Linus Walleij <linusw@kernel.org>
Cc: Rob Herring <robh@kernel.org>
Cc: devicetree@vger.kernel.org
Cc: kernel@dh-electronics.com
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-gpio@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-stm32@st-md-mailman.stormreply.com
---
 arch/arm64/boot/dts/st/stm32mp25-pinctrl.dtsi | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm64/boot/dts/st/stm32mp25-pinctrl.dtsi b/arch/arm64/boot/dts/st/stm32mp25-pinctrl.dtsi
index 757cdd2415394..75f516b8d6af7 100644
--- a/arch/arm64/boot/dts/st/stm32mp25-pinctrl.dtsi
+++ b/arch/arm64/boot/dts/st/stm32mp25-pinctrl.dtsi
@@ -240,6 +240,7 @@ pins1 {
 			bias-disable;
 			drive-push-pull;
 			slew-rate = <3>;
+			st,io-sync = "data on both edges";
 		};
 		pins2 {
 			pinmux = <STM32_PINMUX('F', 8, AF10)>, /* ETH_RGMII_CLK125 */
@@ -255,6 +256,7 @@ pins3 {
 				 <STM32_PINMUX('C', 11, AF10)>, /* ETH_RGMII_RXD3 */
 				 <STM32_PINMUX('C', 3, AF10)>; /* ETH_RGMII_RX_CTL */
 			bias-disable;
+			st,io-sync = "data on both edges";
 		};
 		pins4 {
 			pinmux = <STM32_PINMUX('F', 6, AF10)>; /* ETH_RGMII_RX_CLK */
-- 
2.53.0

[PATCH 2/5] arm64: dts: st: Fix PF7 AF10 comment

[Marek Vasut]

The PF10 AF10 is ETH_RGMII_GTX_CLK , fix the comment.

Fixes: e2fce4620933 ("arm64: dts: st: Add pinmux nodes for DH electronics STM32MP23xx/STM32MP25xx DHCOS SoM and Breakout Board")
Signed-off-by: Marek Vasut <marex@nabladev.com>
---
Cc: Alexandre Torgue <alexandre.torgue@foss.st.com>
Cc: Bartosz Golaszewski <brgl@kernel.org>
Cc: Conor Dooley <conor+dt@kernel.org>
Cc: Krzysztof Kozlowski <krzk+dt@kernel.org>
Cc: Linus Walleij <linusw@kernel.org>
Cc: Rob Herring <robh@kernel.org>
Cc: devicetree@vger.kernel.org
Cc: kernel@dh-electronics.com
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-gpio@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-stm32@st-md-mailman.stormreply.com
---
 arch/arm64/boot/dts/st/stm32mp25-pinctrl.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/st/stm32mp25-pinctrl.dtsi b/arch/arm64/boot/dts/st/stm32mp25-pinctrl.dtsi
index 75f516b8d6af7..674d30dac4d09 100644
--- a/arch/arm64/boot/dts/st/stm32mp25-pinctrl.dtsi
+++ b/arch/arm64/boot/dts/st/stm32mp25-pinctrl.dtsi
@@ -244,7 +244,7 @@ pins1 {
 		};
 		pins2 {
 			pinmux = <STM32_PINMUX('F', 8, AF10)>, /* ETH_RGMII_CLK125 */
-				 <STM32_PINMUX('F', 7, AF10)>; /* ETH_MDC */
+				 <STM32_PINMUX('F', 7, AF10)>; /* ETH_RGMII_GTX_CLK */
 			bias-disable;
 			drive-push-pull;
 			slew-rate = <3>;
-- 
2.53.0

[PATCH 3/5] arm64: dts: st: Reuse sdmmc1_*_pins_a pinmux

[Marek Vasut]

It is perfectly possible to use sdmmc1_*_pins_a on the DH electronics
STM32MP23xx/STM32MP25xx DHCOS SoM, the only difference is the slew rate.
Reuse sdmmc1_*_pins_a with updated slew rate on board level.

Fixes: 9b584c92f94f ("arm64: dts: st: Add support for DH electronics STM32MP23xx/STM32MP25xx DHCOS SoM and Breakout Board and DHSBC")
Signed-off-by: Marek Vasut <marex@nabladev.com>
---
Cc: Alexandre Torgue <alexandre.torgue@foss.st.com>
Cc: Bartosz Golaszewski <brgl@kernel.org>
Cc: Conor Dooley <conor+dt@kernel.org>
Cc: Krzysztof Kozlowski <krzk+dt@kernel.org>
Cc: Linus Walleij <linusw@kernel.org>
Cc: Rob Herring <robh@kernel.org>
Cc: devicetree@vger.kernel.org
Cc: kernel@dh-electronics.com
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-gpio@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-stm32@st-md-mailman.stormreply.com
---
 .../boot/dts/st/stm32mp255c-dhcos-dhsbc.dts   | 28 +++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/st/stm32mp255c-dhcos-dhsbc.dts b/arch/arm64/boot/dts/st/stm32mp255c-dhcos-dhsbc.dts
index 332a8034cc372..eea7a76953639 100644
--- a/arch/arm64/boot/dts/st/stm32mp255c-dhcos-dhsbc.dts
+++ b/arch/arm64/boot/dts/st/stm32mp255c-dhcos-dhsbc.dts
@@ -145,10 +145,34 @@ &scmi_vddio1 {
 	regulator-settling-time-down-us = <100000>;
 };
 
+&sdmmc1_b4_pins_a {
+	pins1 {
+		slew-rate = <1>;
+	};
+
+	pins2 {
+		slew-rate = <2>;
+	};
+};
+
+&sdmmc1_b4_od_pins_a {
+	pins1 {
+		slew-rate = <1>;
+	};
+
+	pins2 {
+		slew-rate = <2>;
+	};
+
+	pins3 {
+		slew-rate = <1>;
+	};
+};
+
 &sdmmc1 {
 	pinctrl-names = "default", "opendrain", "sleep";
-	pinctrl-0 = <&sdmmc1_b4_pins_b>;
-	pinctrl-1 = <&sdmmc1_b4_od_pins_b>;
+	pinctrl-0 = <&sdmmc1_b4_pins_a>;
+	pinctrl-1 = <&sdmmc1_b4_od_pins_a>;
 	pinctrl-2 = <&sdmmc1_b4_sleep_pins_a>;
 	cd-gpios = <&ioexp 8 GPIO_ACTIVE_HIGH>;
 	disable-wp;
-- 
2.53.0

[PATCH 4/5] arm64: dts: st: Drop sdmmc1_*_pins_b pinmux

[Marek Vasut]

The sdmmc1_*_pins_b pinmux nodes are unused, drop them.

Fixes: e2fce4620933 ("arm64: dts: st: Add pinmux nodes for DH electronics STM32MP23xx/STM32MP25xx DHCOS SoM and Breakout Board")
Signed-off-by: Marek Vasut <marex@nabladev.com>
---
Cc: Alexandre Torgue <alexandre.torgue@foss.st.com>
Cc: Bartosz Golaszewski <brgl@kernel.org>
Cc: Conor Dooley <conor+dt@kernel.org>
Cc: Krzysztof Kozlowski <krzk+dt@kernel.org>
Cc: Linus Walleij <linusw@kernel.org>
Cc: Rob Herring <robh@kernel.org>
Cc: devicetree@vger.kernel.org
Cc: kernel@dh-electronics.com
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-gpio@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-stm32@st-md-mailman.stormreply.com
---
 arch/arm64/boot/dts/st/stm32mp25-pinctrl.dtsi | 45 -------------------
 1 file changed, 45 deletions(-)

diff --git a/arch/arm64/boot/dts/st/stm32mp25-pinctrl.dtsi b/arch/arm64/boot/dts/st/stm32mp25-pinctrl.dtsi
index 674d30dac4d09..56c2c99a05d4d 100644
--- a/arch/arm64/boot/dts/st/stm32mp25-pinctrl.dtsi
+++ b/arch/arm64/boot/dts/st/stm32mp25-pinctrl.dtsi
@@ -675,26 +675,6 @@ pins2 {
 		};
 	};
 
-	/omit-if-no-ref/
-	sdmmc1_b4_pins_b: sdmmc1-b4-1 {
-		pins1 {
-			pinmux = <STM32_PINMUX('E', 4, AF10)>, /* SDMMC1_D0 */
-				 <STM32_PINMUX('E', 5, AF10)>, /* SDMMC1_D1 */
-				 <STM32_PINMUX('E', 0, AF10)>, /* SDMMC1_D2 */
-				 <STM32_PINMUX('E', 1, AF10)>, /* SDMMC1_D3 */
-				 <STM32_PINMUX('E', 2, AF10)>; /* SDMMC1_CMD */
-			slew-rate = <1>;
-			drive-push-pull;
-			bias-disable;
-		};
-		pins2 {
-			pinmux = <STM32_PINMUX('E', 3, AF10)>; /* SDMMC1_CK */
-			slew-rate = <2>;
-			drive-push-pull;
-			bias-disable;
-		};
-	};
-
 	/omit-if-no-ref/
 	sdmmc1_b4_od_pins_a: sdmmc1-b4-od-0 {
 		pins1 {
@@ -720,31 +700,6 @@ pins3 {
 		};
 	};
 
-	/omit-if-no-ref/
-	sdmmc1_b4_od_pins_b: sdmmc1-b4-od-1 {
-		pins1 {
-			pinmux = <STM32_PINMUX('E', 4, AF10)>, /* SDMMC1_D0 */
-				 <STM32_PINMUX('E', 5, AF10)>, /* SDMMC1_D1 */
-				 <STM32_PINMUX('E', 0, AF10)>, /* SDMMC1_D2 */
-				 <STM32_PINMUX('E', 1, AF10)>; /* SDMMC1_D3 */
-			slew-rate = <1>;
-			drive-push-pull;
-			bias-disable;
-		};
-		pins2 {
-			pinmux = <STM32_PINMUX('E', 3, AF10)>; /* SDMMC1_CK */
-			slew-rate = <2>;
-			drive-push-pull;
-			bias-disable;
-		};
-		pins3 {
-			pinmux = <STM32_PINMUX('E', 2, AF10)>; /* SDMMC1_CMD */
-			slew-rate = <1>;
-			drive-open-drain;
-			bias-disable;
-		};
-	};
-
 	/omit-if-no-ref/
 	sdmmc1_b4_sleep_pins_a: sdmmc1-b4-sleep-0 {
 		pins {
-- 
2.53.0

[PATCH 5/5] arm64: dts: st: Do not encode path in sdmmc2_*_pins_a/pins2 phandle

[Marek Vasut]

Do not encode node path in phandles, describe subnodes instead.
This is only a consistency change, no functional change.

Fixes: 9b584c92f94f ("arm64: dts: st: Add support for DH electronics STM32MP23xx/STM32MP25xx DHCOS SoM and Breakout Board and DHSBC")
Signed-off-by: Marek Vasut <marex@nabladev.com>
---
Cc: Alexandre Torgue <alexandre.torgue@foss.st.com>
Cc: Bartosz Golaszewski <brgl@kernel.org>
Cc: Conor Dooley <conor+dt@kernel.org>
Cc: Krzysztof Kozlowski <krzk+dt@kernel.org>
Cc: Linus Walleij <linusw@kernel.org>
Cc: Rob Herring <robh@kernel.org>
Cc: devicetree@vger.kernel.org
Cc: kernel@dh-electronics.com
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-gpio@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-stm32@st-md-mailman.stormreply.com
---
 .../arm64/boot/dts/st/stm32mp2xxx-dhcos-som.dtsi | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/arch/arm64/boot/dts/st/stm32mp2xxx-dhcos-som.dtsi b/arch/arm64/boot/dts/st/stm32mp2xxx-dhcos-som.dtsi
index 80d829c55d9d8..bcf63e2ea9898 100644
--- a/arch/arm64/boot/dts/st/stm32mp2xxx-dhcos-som.dtsi
+++ b/arch/arm64/boot/dts/st/stm32mp2xxx-dhcos-som.dtsi
@@ -389,14 +389,18 @@ &scmi_vddio4 {
 	regulator-always-on;
 };
 
-&{sdmmc2_b4_pins_a/pins2} {
-	/delete-property/ bias-disable;
-	bias-pull-up;
+&sdmmc2_b4_pins_a {
+	pins2 {
+		/delete-property/ bias-disable;
+		bias-pull-up;
+	};
 };
 
-&{sdmmc2_b4_od_pins_a/pins2} {
-	/delete-property/ bias-disable;
-	bias-pull-up;
+&sdmmc2_b4_od_pins_a {
+	pins2 {
+		/delete-property/ bias-disable;
+		bias-pull-up;
+	};
 };
 
 &sdmmc2 {
-- 
2.53.0