ARM: dts: stm32f429: Align Ethernet node with new bindings properties

This patch aligns clocks names and node reference according to new
stm32-dwmac glue binding. It also renames Ethernet pinctrl phandle
(indeed there is no need to add 0 as Ethernet instance as there is only
one IP in SOC).

Signed-off-by: Alexandre TORGUE <alexandre.torgue@st.com>

diff --git a/arch/arm/boot/dts/stm32429i-eval.dts b/arch/arm/boot/dts/stm32429i-eval.dts
index 7d2f84df1a03f8d5dedd3e62d0df643f4e846ab7..380a002829d60b368045bfd1e916354a48b7373b 100644 (file)
--- a/arch/arm/boot/dts/stm32429i-eval.dts
+++ b/arch/arm/boot/dts/stm32429i-eval.dts
@@ -116,11 +116,12 @@
        clock-frequency = <25000000>;
 };
 
-&ethernet0 {
+&mac {
        status = "okay";
-       pinctrl-0       = <&ethernet0_mii>;
+       pinctrl-0       = <&ethernet_mii>;
        pinctrl-names   = "default";
-       phy-mode        = "mii-id";
+       phy-mode        = "mii";
+
        mdio0 {
                #address-cells = <1>;
                #size-cells = <0>;

diff --git a/arch/arm/boot/dts/stm32f429.dtsi b/arch/arm/boot/dts/stm32f429.dtsi
index 8af8ac9d94e1edfefb9f2ad00c0a0b212ead7173..b9286607e9f9aafd5fa9a859bcb8a9c12ed247cf 100644 (file)
--- a/arch/arm/boot/dts/stm32f429.dtsi
+++ b/arch/arm/boot/dts/stm32f429.dtsi
@@ -319,7 +319,7 @@
                                };
                        };
 
-                       ethernet0_mii: mii@0 {
+                       ethernet_mii: mii@0 {
                                pins {
                                        pinmux = <STM32F429_PG13_FUNC_ETH_MII_TXD0_ETH_RMII_TXD0>,
                                                 <STM32F429_PG14_FUNC_ETH_MII_TXD1_ETH_RMII_TXD1>,
@@ -379,13 +379,13 @@
                        st,mem2mem;
                };
 
-               ethernet0: dwmac@40028000 {
+               mac: ethernet@40028000 {
                        compatible = "st,stm32-dwmac", "snps,dwmac-3.50a";
                        reg = <0x40028000 0x8000>;
                        reg-names = "stmmaceth";
                        interrupts = <61>, <62>;
                        interrupt-names = "macirq", "eth_wake_irq";
-                       clock-names = "stmmaceth", "tx-clk", "rx-clk";
+                       clock-names = "stmmaceth", "mac-clk-tx", "mac-clk-rx";
                        clocks = <&rcc 0 25>, <&rcc 0 26>, <&rcc 0 27>;
                        st,syscon = <&syscfg 0x4>;
                        snps,pbl = <8>;