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

Now that the clock-frequency information has been moved to the
driver, more DT sync is possible.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/arch/arm/dts/uniphier-ld11.dtsi b/arch/arm/dts/uniphier-ld11.dtsi
index e7514f01fa0788fe5af31d86e04badf481f6d804..3f9237cfa4e3cb0d3e34af7ff201b6ac1e966b9c 100644 (file)
--- a/arch/arm/dts/uniphier-ld11.dtsi
+++ b/arch/arm/dts/uniphier-ld11.dtsi
@@ -124,7 +124,6 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart0>;
                        clocks = <&peri_clk 0>;
-                       clock-frequency = <58820000>;
                        resets = <&peri_rst 0>;
                };
 
@@ -136,7 +135,6 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart1>;
                        clocks = <&peri_clk 1>;
-                       clock-frequency = <58820000>;
                        resets = <&peri_rst 1>;
                };
 
@@ -148,7 +146,6 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart2>;
                        clocks = <&peri_clk 2>;
-                       clock-frequency = <58820000>;
                        resets = <&peri_rst 2>;
                };
 
@@ -160,7 +157,6 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart3>;
                        clocks = <&peri_clk 3>;
-                       clock-frequency = <58820000>;
                        resets = <&peri_rst 3>;
                };
 

diff --git a/arch/arm/dts/uniphier-ld20.dtsi b/arch/arm/dts/uniphier-ld20.dtsi
index 31bc124dfca7f98e79a39e40de4ca595ec831284..6ffbf18a8c936092924fb3e190ede466f3a61d34 100644 (file)
--- a/arch/arm/dts/uniphier-ld20.dtsi
+++ b/arch/arm/dts/uniphier-ld20.dtsi
@@ -230,7 +230,6 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart0>;
                        clocks = <&peri_clk 0>;
-                       clock-frequency = <58820000>;
                        resets = <&peri_rst 0>;
                };
 
@@ -242,7 +241,6 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart1>;
                        clocks = <&peri_clk 1>;
-                       clock-frequency = <58820000>;
                        resets = <&peri_rst 1>;
                };
 
@@ -254,7 +252,6 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart2>;
                        clocks = <&peri_clk 2>;
-                       clock-frequency = <58820000>;
                        resets = <&peri_rst 2>;
                };
 
@@ -266,7 +263,6 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart3>;
                        clocks = <&peri_clk 3>;
-                       clock-frequency = <58820000>;
                        resets = <&peri_rst 3>;
                };
 

diff --git a/arch/arm/dts/uniphier-ld4.dtsi b/arch/arm/dts/uniphier-ld4.dtsi
index 5e43a9231ebd766d1f2bc0d70a098b452e959ad2..4545056ba708ea00f11a6c3ec17dafe58b802b7c 100644 (file)
--- a/arch/arm/dts/uniphier-ld4.dtsi
+++ b/arch/arm/dts/uniphier-ld4.dtsi
@@ -71,7 +71,6 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart0>;
                        clocks = <&peri_clk 0>;
-                       clock-frequency = <36864000>;
                        resets = <&peri_rst 0>;
                };
 
@@ -83,7 +82,6 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart1>;
                        clocks = <&peri_clk 1>;
-                       clock-frequency = <36864000>;
                        resets = <&peri_rst 1>;
                };
 
@@ -95,7 +93,6 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart2>;
                        clocks = <&peri_clk 2>;
-                       clock-frequency = <36864000>;
                        resets = <&peri_rst 2>;
                };
 
@@ -107,7 +104,6 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart3>;
                        clocks = <&peri_clk 3>;
-                       clock-frequency = <36864000>;
                        resets = <&peri_rst 3>;
                };
 

diff --git a/arch/arm/dts/uniphier-pro4.dtsi b/arch/arm/dts/uniphier-pro4.dtsi
index 000486358947815dda73b7ae679fc1277d9a687c..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>;
                };
 
@@ -429,7 +425,7 @@
                        pinctrl-0 = <&pinctrl_ether_rgmii>;
                        clock-names = "gio", "ether", "ether-gb", "ether-phy";
                        clocks = <&sys_clk 12>, <&sys_clk 6>, <&sys_clk 7>,
-                               <&sys_clk 10>;
+                                <&sys_clk 10>;
                        reset-names = "gio", "ether";
                        resets = <&sys_rst 12>, <&sys_rst 6>;
                        phy-mode = "rgmii";

diff --git a/arch/arm/dts/uniphier-pro5.dtsi b/arch/arm/dts/uniphier-pro5.dtsi
index 32debf557e431375ce8995ae9fbc79f65ad70894..6aea9af2b6c516867217fcc90fd8984db1995691 100644 (file)
--- a/arch/arm/dts/uniphier-pro5.dtsi
+++ b/arch/arm/dts/uniphier-pro5.dtsi
@@ -164,7 +164,6 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart0>;
                        clocks = <&peri_clk 0>;
-                       clock-frequency = <73728000>;
                        resets = <&peri_rst 0>;
                };
 
@@ -176,7 +175,6 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart1>;
                        clocks = <&peri_clk 1>;
-                       clock-frequency = <73728000>;
                        resets = <&peri_rst 1>;
                };
 
@@ -188,7 +186,6 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart2>;
                        clocks = <&peri_clk 2>;
-                       clock-frequency = <73728000>;
                        resets = <&peri_rst 2>;
                };
 
@@ -200,7 +197,6 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart3>;
                        clocks = <&peri_clk 3>;
-                       clock-frequency = <73728000>;
                        resets = <&peri_rst 3>;
                };
 

diff --git a/arch/arm/dts/uniphier-pxs2.dtsi b/arch/arm/dts/uniphier-pxs2.dtsi
index 20f393510731280595fc854acd8ef9f44783921f..f4101c0aa0cb87f37c75d376978bc83dd6847aac 100644 (file)
--- a/arch/arm/dts/uniphier-pxs2.dtsi
+++ b/arch/arm/dts/uniphier-pxs2.dtsi
@@ -172,7 +172,6 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart0>;
                        clocks = <&peri_clk 0>;
-                       clock-frequency = <88900000>;
                        resets = <&peri_rst 0>;
                };
 
@@ -184,7 +183,6 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart1>;
                        clocks = <&peri_clk 1>;
-                       clock-frequency = <88900000>;
                        resets = <&peri_rst 1>;
                };
 
@@ -196,7 +194,6 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart2>;
                        clocks = <&peri_clk 2>;
-                       clock-frequency = <88900000>;
                        resets = <&peri_rst 2>;
                };
 
@@ -208,7 +205,6 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart3>;
                        clocks = <&peri_clk 3>;
-                       clock-frequency = <88900000>;
                        resets = <&peri_rst 3>;
                };
 

diff --git a/arch/arm/dts/uniphier-pxs3.dtsi b/arch/arm/dts/uniphier-pxs3.dtsi
index ae867cbb0acbe09bd9a56f7490e393701ed468d7..cfeeecdad0568d7d11880384ca6568fae8fa40e8 100644 (file)
--- a/arch/arm/dts/uniphier-pxs3.dtsi
+++ b/arch/arm/dts/uniphier-pxs3.dtsi
@@ -152,7 +152,6 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart0>;
                        clocks = <&peri_clk 0>;
-                       clock-frequency = <58820000>;
                        resets = <&peri_rst 0>;
                };
 
@@ -164,7 +163,6 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart1>;
                        clocks = <&peri_clk 1>;
-                       clock-frequency = <58820000>;
                        resets = <&peri_rst 1>;
                };
 
@@ -176,7 +174,6 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart2>;
                        clocks = <&peri_clk 2>;
-                       clock-frequency = <58820000>;
                        resets = <&peri_rst 2>;
                };
 
@@ -188,7 +185,6 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart3>;
                        clocks = <&peri_clk 3>;
-                       clock-frequency = <58820000>;
                        resets = <&peri_rst 3>;
                };
 

diff --git a/arch/arm/dts/uniphier-sld8.dtsi b/arch/arm/dts/uniphier-sld8.dtsi
index 67d69778a4cf003d5bf75fd345b55bbe3996bfde..f20926e4a995d8e2b224d7aa7154155349963513 100644 (file)
--- a/arch/arm/dts/uniphier-sld8.dtsi
+++ b/arch/arm/dts/uniphier-sld8.dtsi
@@ -71,7 +71,6 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart0>;
                        clocks = <&peri_clk 0>;
-                       clock-frequency = <80000000>;
                        resets = <&peri_rst 0>;
                };
 
@@ -83,7 +82,6 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart1>;
                        clocks = <&peri_clk 1>;
-                       clock-frequency = <80000000>;
                        resets = <&peri_rst 1>;
                };
 
@@ -95,7 +93,6 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart2>;
                        clocks = <&peri_clk 2>;
-                       clock-frequency = <80000000>;
                        resets = <&peri_rst 2>;
                };
 
@@ -107,7 +104,6 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart3>;
                        clocks = <&peri_clk 3>;
-                       clock-frequency = <80000000>;
                        resets = <&peri_rst 3>;
                };