aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaravanan Sekar <sravanhome@gmail.com>2018-07-19 05:06:49 -0400
committerAndreas Färber <afaerber@suse.de>2018-09-30 12:57:23 -0400
commit01463ac63b53e24e4e315aa9c5f091e9e0342ad4 (patch)
tree789d33824ff3fda4fb6841e76167142c1c26992f
parent8ba92cf5933507d1af6422d7421448fbf8c9981f (diff)
arm64: dts: actions: s700: Set UART clock references from CMU
Remove fixed clock in Cubieboard 7 and use Clock Management Unit clocks for all UART nodes in Actions Semi S700 SoC. Signed-off-by: Parthiban Nallathambi <pn@denx.de> Signed-off-by: Saravanan Sekar <sravanhome@gmail.com> Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> [AF: Moved/added to SoC] Signed-off-by: Andreas Färber <afaerber@suse.de>
-rw-r--r--arch/arm64/boot/dts/actions/s700-cubieboard7.dts7
-rw-r--r--arch/arm64/boot/dts/actions/s700.dtsi7
2 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm64/boot/dts/actions/s700-cubieboard7.dts b/arch/arm64/boot/dts/actions/s700-cubieboard7.dts
index ef79d7905f44..28f3f4a0f7f0 100644
--- a/arch/arm64/boot/dts/actions/s700-cubieboard7.dts
+++ b/arch/arm64/boot/dts/actions/s700-cubieboard7.dts
@@ -28,12 +28,6 @@
28 device_type = "memory"; 28 device_type = "memory";
29 reg = <0x1 0xe0000000 0x0 0x0>; 29 reg = <0x1 0xe0000000 0x0 0x0>;
30 }; 30 };
31
32 uart3_clk: uart3-clk {
33 compatible = "fixed-clock";
34 clock-frequency = <921600>;
35 #clock-cells = <0>;
36 };
37}; 31};
38 32
39&timer { 33&timer {
@@ -42,5 +36,4 @@
42 36
43&uart3 { 37&uart3 {
44 status = "okay"; 38 status = "okay";
45 clocks = <&uart3_clk>;
46}; 39};
diff --git a/arch/arm64/boot/dts/actions/s700.dtsi b/arch/arm64/boot/dts/actions/s700.dtsi
index 0b04c5582213..192c7b39c8c1 100644
--- a/arch/arm64/boot/dts/actions/s700.dtsi
+++ b/arch/arm64/boot/dts/actions/s700.dtsi
@@ -114,6 +114,7 @@
114 uart0: serial@e0120000 { 114 uart0: serial@e0120000 {
115 compatible = "actions,s900-uart", "actions,owl-uart"; 115 compatible = "actions,s900-uart", "actions,owl-uart";
116 reg = <0x0 0xe0120000 0x0 0x2000>; 116 reg = <0x0 0xe0120000 0x0 0x2000>;
117 clocks = <&cmu CLK_UART0>;
117 interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>; 118 interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
118 status = "disabled"; 119 status = "disabled";
119 }; 120 };
@@ -121,6 +122,7 @@
121 uart1: serial@e0122000 { 122 uart1: serial@e0122000 {
122 compatible = "actions,s900-uart", "actions,owl-uart"; 123 compatible = "actions,s900-uart", "actions,owl-uart";
123 reg = <0x0 0xe0122000 0x0 0x2000>; 124 reg = <0x0 0xe0122000 0x0 0x2000>;
125 clocks = <&cmu CLK_UART1>;
124 interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>; 126 interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
125 status = "disabled"; 127 status = "disabled";
126 }; 128 };
@@ -128,6 +130,7 @@
128 uart2: serial@e0124000 { 130 uart2: serial@e0124000 {
129 compatible = "actions,s900-uart", "actions,owl-uart"; 131 compatible = "actions,s900-uart", "actions,owl-uart";
130 reg = <0x0 0xe0124000 0x0 0x2000>; 132 reg = <0x0 0xe0124000 0x0 0x2000>;
133 clocks = <&cmu CLK_UART2>;
131 interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>; 134 interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
132 status = "disabled"; 135 status = "disabled";
133 }; 136 };
@@ -135,6 +138,7 @@
135 uart3: serial@e0126000 { 138 uart3: serial@e0126000 {
136 compatible = "actions,s900-uart", "actions,owl-uart"; 139 compatible = "actions,s900-uart", "actions,owl-uart";
137 reg = <0x0 0xe0126000 0x0 0x2000>; 140 reg = <0x0 0xe0126000 0x0 0x2000>;
141 clocks = <&cmu CLK_UART3>;
138 interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>; 142 interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
139 status = "disabled"; 143 status = "disabled";
140 }; 144 };
@@ -142,6 +146,7 @@
142 uart4: serial@e0128000 { 146 uart4: serial@e0128000 {
143 compatible = "actions,s900-uart", "actions,owl-uart"; 147 compatible = "actions,s900-uart", "actions,owl-uart";
144 reg = <0x0 0xe0128000 0x0 0x2000>; 148 reg = <0x0 0xe0128000 0x0 0x2000>;
149 clocks = <&cmu CLK_UART4>;
145 interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>; 150 interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
146 status = "disabled"; 151 status = "disabled";
147 }; 152 };
@@ -149,6 +154,7 @@
149 uart5: serial@e012a000 { 154 uart5: serial@e012a000 {
150 compatible = "actions,s900-uart", "actions,owl-uart"; 155 compatible = "actions,s900-uart", "actions,owl-uart";
151 reg = <0x0 0xe012a000 0x0 0x2000>; 156 reg = <0x0 0xe012a000 0x0 0x2000>;
157 clocks = <&cmu CLK_UART5>;
152 interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>; 158 interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
153 status = "disabled"; 159 status = "disabled";
154 }; 160 };
@@ -156,6 +162,7 @@
156 uart6: serial@e012c000 { 162 uart6: serial@e012c000 {
157 compatible = "actions,s900-uart", "actions,owl-uart"; 163 compatible = "actions,s900-uart", "actions,owl-uart";
158 reg = <0x0 0xe012c000 0x0 0x2000>; 164 reg = <0x0 0xe012c000 0x0 0x2000>;
165 clocks = <&cmu CLK_UART6>;
159 interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>; 166 interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
160 status = "disabled"; 167 status = "disabled";
161 }; 168 };