aboutsummaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorMasahiro Yamada2018-06-19 16:11:46 +0900
committerMasahiro Yamada2018-06-23 01:28:16 +0900
commite885c5a602998e8d67bc2ceb1db112c65bce2a8d (patch)
tree03b51e1a685446954eb606c2b793f5c6ee552b0f /arch/arm
parent41bacb597e6a3bb9e0ba514d4280aa0af5391f43 (diff)
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>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/dts/uniphier-ld11.dtsi4
-rw-r--r--arch/arm/dts/uniphier-ld20.dtsi4
-rw-r--r--arch/arm/dts/uniphier-ld4.dtsi4
-rw-r--r--arch/arm/dts/uniphier-pro4.dtsi6
-rw-r--r--arch/arm/dts/uniphier-pro5.dtsi4
-rw-r--r--arch/arm/dts/uniphier-pxs2.dtsi4
-rw-r--r--arch/arm/dts/uniphier-pxs3.dtsi4
-rw-r--r--arch/arm/dts/uniphier-sld8.dtsi4
8 files changed, 1 insertions, 33 deletions
diff --git a/arch/arm/dts/uniphier-ld11.dtsi b/arch/arm/dts/uniphier-ld11.dtsi
index e7514f01fa0..3f9237cfa4e 100644
--- 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 31bc124dfca..6ffbf18a8c9 100644
--- 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 5e43a9231eb..4545056ba70 100644
--- 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 00048635894..8185b54e285 100644
--- 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 32debf557e4..6aea9af2b6c 100644
--- 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 20f39351073..f4101c0aa0c 100644
--- 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 ae867cbb0ac..cfeeecdad05 100644
--- 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 67d69778a4c..f20926e4a99 100644
--- 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>;
};