[PATCH 5.8 509/633] ARM: dts: stm32: Move ethernet PHY into DH SoM DT

[Greg Kroah-Hartman]

From: Marek Vasut <ma...@denx.de>

[ Upstream commit b0a07f609600b6fa4c30f783db50c38456804485 ]

The PHY and the VIO regulator is populated on the SoM, move it
into the SoM DT.

Signed-off-by: Marek Vasut <ma...@denx.de>
Cc: Alexandre Torgue <alexandre.tor...@st.com>
Cc: Maxime Coquelin <mcoquelin.st...@gmail.com>
Cc: Patrice Chotard <patrice.chot...@st.com>
Cc: Patrick Delaunay <patrick.delau...@st.com>
Cc: linux-st...@st-md-mailman.stormreply.com
To: linux-arm-ker...@lists.infradead.org
Signed-off-by: Alexandre Torgue <alexandre.tor...@st.com>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi | 33 -----------------
 arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi  | 36 +++++++++++++++++++
 2 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi 
b/arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi
index 7c4bd615b3115..9cf6d90fbf69f 100644
--- a/arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi
+++ b/arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi
@@ -11,7 +11,6 @@ aliases {
                serial0 = &uart4;
                serial1 = &usart3;
                serial2 = &uart8;
-               ethernet0 = &ethernet0;
        };
 
        chosen {
@@ -33,16 +32,6 @@ display_bl: display-bl {
                status = "okay";
        };
 
-       ethernet_vio: vioregulator {
-               compatible = "regulator-fixed";
-               regulator-name = "vio";
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
-               gpio = <&gpiog 3 GPIO_ACTIVE_LOW>;
-               regulator-always-on;
-               regulator-boot-on;
-       };
-
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
                #size-cells = <0>;
@@ -141,28 +130,6 @@ &cec {
        status = "okay";
 };
 
-&ethernet0 {
-       status = "okay";
-       pinctrl-0 = <&ethernet0_rmii_pins_a>;
-       pinctrl-1 = <&ethernet0_rmii_sleep_pins_a>;
-       pinctrl-names = "default", "sleep";
-       phy-mode = "rmii";
-       max-speed = <100>;
-       phy-handle = <&phy0>;
-       st,eth-ref-clk-sel;
-       phy-reset-gpios = <&gpioh 15 GPIO_ACTIVE_LOW>;
-
-       mdio0 {
-               #address-cells = <1>;
-               #size-cells = <0>;
-               compatible = "snps,dwmac-mdio";
-
-               phy0: ethernet-phy@1 {
-                       reg = <1>;
-               };
-       };
-};
-
 &i2c2 {        /* Header X22 */
        pinctrl-names = "default";
        pinctrl-0 = <&i2c2_pins_a>;
diff --git a/arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi 
b/arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi
index ba905196fb549..d30a3c60da9b0 100644
--- a/arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi
+++ b/arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi
@@ -9,6 +9,10 @@
 #include <dt-bindings/mfd/st,stpmic1.h>
 
 / {
+       aliases {
+               ethernet0 = &ethernet0;
+       };
+
        memory@c0000000 {
                device_type = "memory";
                reg = <0xC0000000 0x40000000>;
@@ -55,6 +59,16 @@ retram: retram@38000000 {
                        no-map;
                };
        };
+
+       ethernet_vio: vioregulator {
+               compatible = "regulator-fixed";
+               regulator-name = "vio";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               gpio = <&gpiog 3 GPIO_ACTIVE_LOW>;
+               regulator-always-on;
+               regulator-boot-on;
+       };
 };
 
 &adc {
@@ -94,6 +108,28 @@ &dts {
        status = "okay";
 };
 
+&ethernet0 {
+       status = "okay";
+       pinctrl-0 = <&ethernet0_rmii_pins_a>;
+       pinctrl-1 = <&ethernet0_rmii_sleep_pins_a>;
+       pinctrl-names = "default", "sleep";
+       phy-mode = "rmii";
+       max-speed = <100>;
+       phy-handle = <&phy0>;
+       st,eth-ref-clk-sel;
+       phy-reset-gpios = <&gpioh 15 GPIO_ACTIVE_LOW>;
+
+       mdio0 {
+               #address-cells = <1>;
+               #size-cells = <0>;
+               compatible = "snps,dwmac-mdio";
+
+               phy0: ethernet-phy@1 {
+                       reg = <1>;
+               };
+       };
+};
+
 &i2c4 {
        pinctrl-names = "default";
        pinctrl-0 = <&i2c4_pins_a>;
-- 
2.25.1