arm64: dts: actions: s900: Source CMU clock for UARTs

Remove fixed clock in Bubblegum-96 board and source CMU (Clock
Management Unit) clock for UART nodes in Actions Semi S900 SoC.

Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
[AF: Move/add clocks to SoC]
Signed-off-by: Andreas Färber <afaerber@suse.de>

diff --git a/arch/arm64/boot/dts/actions/s900-bubblegum-96.dts b/arch/arm64/boot/dts/actions/s900-bubblegum-96.dts
index 562d89df811ca9d47a4e8c5ab5e9301ca57ffde6..84d42dc0778762df152824922d006a568020c928 100644 (file)
--- a/arch/arm64/boot/dts/actions/s900-bubblegum-96.dts
+++ b/arch/arm64/boot/dts/actions/s900-bubblegum-96.dts
@@ -23,12 +23,6 @@ memory@0 {
                device_type = "memory";
                reg = <0x0 0x0 0x0 0x80000000>;
        };
-
-       uart5_clk: uart5-clk {
-               compatible = "fixed-clock";
-               clock-frequency = <921600>;
-               #clock-cells = <0>;
-       };
 };
 
 &timer {
@@ -37,5 +31,4 @@ &timer {
 
 &uart5 {
        status = "okay";
-       clocks = <&uart5_clk>;
 };

diff --git a/arch/arm64/boot/dts/actions/s900.dtsi b/arch/arm64/boot/dts/actions/s900.dtsi
index 19ccad4faae8f73d1914d3d6561e9f4a9d5b5705..f254b1843db2a3db7938aa47516dd4bbdce9a394 100644 (file)
--- a/arch/arm64/boot/dts/actions/s900.dtsi
+++ b/arch/arm64/boot/dts/actions/s900.dtsi
@@ -120,6 +120,7 @@ gic: interrupt-controller@e00f1000 {
                uart0: serial@e0120000 {
                        compatible = "actions,s900-uart", "actions,owl-uart";
                        reg = <0x0 0xe0120000 0x0 0x2000>;
+                       clocks = <&cmu CLK_UART0>;
                        interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
                        status = "disabled";
                };
@@ -127,6 +128,7 @@ uart0: serial@e0120000 {
                uart1: serial@e0122000 {
                        compatible = "actions,s900-uart", "actions,owl-uart";
                        reg = <0x0 0xe0122000 0x0 0x2000>;
+                       clocks = <&cmu CLK_UART1>;
                        interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
                        status = "disabled";
                };
@@ -134,6 +136,7 @@ uart1: serial@e0122000 {
                uart2: serial@e0124000 {
                        compatible = "actions,s900-uart", "actions,owl-uart";
                        reg = <0x0 0xe0124000 0x0 0x2000>;
+                       clocks = <&cmu CLK_UART2>;
                        interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
                        status = "disabled";
                };
@@ -141,6 +144,7 @@ uart2: serial@e0124000 {
                uart3: serial@e0126000 {
                        compatible = "actions,s900-uart", "actions,owl-uart";
                        reg = <0x0 0xe0126000 0x0 0x2000>;
+                       clocks = <&cmu CLK_UART3>;
                        interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
                        status = "disabled";
                };
@@ -148,6 +152,7 @@ uart3: serial@e0126000 {
                uart4: serial@e0128000 {
                        compatible = "actions,s900-uart", "actions,owl-uart";
                        reg = <0x0 0xe0128000 0x0 0x2000>;
+                       clocks = <&cmu CLK_UART4>;
                        interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
                        status = "disabled";
                };
@@ -155,6 +160,7 @@ uart4: serial@e0128000 {
                uart5: serial@e012a000 {
                        compatible = "actions,s900-uart", "actions,owl-uart";
                        reg = <0x0 0xe012a000 0x0 0x2000>;
+                       clocks = <&cmu CLK_UART5>;
                        interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
                        status = "disabled";
                };
@@ -162,6 +168,7 @@ uart5: serial@e012a000 {
                uart6: serial@e012c000 {
                        compatible = "actions,s900-uart", "actions,owl-uart";
                        reg = <0x0 0xe012c000 0x0 0x2000>;
+                       clocks = <&cmu CLK_UART6>;
                        interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
                        status = "disabled";
                };