ARM: dts: uniphier: sync DT with Linux 4.18-rc1

[u-boot] / arch / arm / dts / uniphier-pro4.dtsi

diff --git a/arch/arm/dts/uniphier-pro4.dtsi b/arch/arm/dts/uniphier-pro4.dtsi
index 25c4b4f8fc04c9a84df74266252e182164aab661..8185b54e2854d2d73ae7c69908f3750a087eadc0 100644 (file)
--- a/arch/arm/dts/uniphier-pro4.dtsi
+++ b/arch/arm/dts/uniphier-pro4.dtsi
@@ -79,7 +79,6 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart0>;
                        clocks = <&peri_clk 0>;
-                       clock-frequency = <73728000>;
                        resets = <&peri_rst 0>;
                };
 
@@ -91,7 +90,6 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart1>;
                        clocks = <&peri_clk 1>;
-                       clock-frequency = <73728000>;
                        resets = <&peri_rst 1>;
                };
 
@@ -103,7 +101,6 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart2>;
                        clocks = <&peri_clk 2>;
-                       clock-frequency = <73728000>;
                        resets = <&peri_rst 2>;
                };
 
@@ -115,7 +112,6 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart3>;
                        clocks = <&peri_clk 3>;
-                       clock-frequency = <73728000>;
                        resets = <&peri_rst 3>;
                };
 
@@ -342,7 +338,7 @@
                        has-transaction-translator;
                };
 
-               soc-glue@5f800000 {
+               soc_glue: soc-glue@5f800000 {
                        compatible = "socionext,uniphier-pro4-soc-glue",
                                     "simple-mfd", "syscon";
                        reg = <0x5f800000 0x2000>;
@@ -427,10 +423,14 @@
                        interrupts = <0 66 4>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_ether_rgmii>;
-                       clocks = <&sys_clk 6>;
-                       resets = <&sys_rst 6>;
+                       clock-names = "gio", "ether", "ether-gb", "ether-phy";
+                       clocks = <&sys_clk 12>, <&sys_clk 6>, <&sys_clk 7>,
+                                <&sys_clk 10>;
+                       reset-names = "gio", "ether";
+                       resets = <&sys_rst 12>, <&sys_rst 6>;
                        phy-mode = "rgmii";
                        local-mac-address = [00 00 00 00 00 00];
+                       socionext,syscon-phy-mode = <&soc_glue 0>;
 
                        mdio: mdio {
                                #address-cells = <1>;