Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

arm: dts: owl-s500: Set CMU clocks for UARTs

Set Clock Management Unit clocks for the UART nodes of Actions Semi
S500 SoCs and remove the dummy "uart2_clk" and "uart3_clk" fixed clocks.

Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@gmail.com>
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>

authored by

Cristian Ciocaltea and committed by
Manivannan Sadhasivam
11bc96ba b4d1e231

+7 -35
-7
arch/arm/boot/dts/owl-s500-cubieboard6.dts
··· 25 25 device_type = "memory"; 26 26 reg = <0x0 0x80000000>; 27 27 }; 28 - 29 - uart3_clk: uart3-clk { 30 - compatible = "fixed-clock"; 31 - clock-frequency = <921600>; 32 - #clock-cells = <0>; 33 - }; 34 28 }; 35 29 36 30 &timer { ··· 33 39 34 40 &uart3 { 35 41 status = "okay"; 36 - clocks = <&uart3_clk>; 37 42 };
-7
arch/arm/boot/dts/owl-s500-guitar-bb-rev-b.dts
··· 18 18 chosen { 19 19 stdout-path = "serial3:115200n8"; 20 20 }; 21 - 22 - uart3_clk: uart3-clk { 23 - compatible = "fixed-clock"; 24 - clock-frequency = <921600>; 25 - #clock-cells = <0>; 26 - }; 27 21 }; 28 22 29 23 &uart3 { 30 24 status = "okay"; 31 - clocks = <&uart3_clk>; 32 25 };
-7
arch/arm/boot/dts/owl-s500-labrador-base-m.dts
··· 21 21 chosen { 22 22 stdout-path = "serial3:115200n8"; 23 23 }; 24 - 25 - uart3_clk: uart3-clk { 26 - compatible = "fixed-clock"; 27 - clock-frequency = <921600>; 28 - #clock-cells = <0>; 29 - }; 30 24 }; 31 25 32 26 &uart3 { 33 27 status = "okay"; 34 - clocks = <&uart3_clk>; 35 28 };
-7
arch/arm/boot/dts/owl-s500-roseapplepi.dts
··· 25 25 device_type = "memory"; 26 26 reg = <0x0 0x80000000>; /* 2GB */ 27 27 }; 28 - 29 - uart2_clk: uart2-clk { 30 - compatible = "fixed-clock"; 31 - clock-frequency = <921600>; 32 - #clock-cells = <0>; 33 - }; 34 28 }; 35 29 36 30 &twd_timer { ··· 37 43 38 44 &uart2 { 39 45 status = "okay"; 40 - clocks = <&uart2_clk>; 41 46 };
-7
arch/arm/boot/dts/owl-s500-sparky.dts
··· 25 25 device_type = "memory"; 26 26 reg = <0x0 0x40000000>; /* 1 or 2 GiB */ 27 27 }; 28 - 29 - uart3_clk: uart3-clk { 30 - compatible = "fixed-clock"; 31 - clock-frequency = <921600>; 32 - #clock-cells = <0>; 33 - }; 34 28 }; 35 29 36 30 &timer { ··· 33 39 34 40 &uart3 { 35 41 status = "okay"; 36 - clocks = <&uart3_clk>; 37 42 };
+7
arch/arm/boot/dts/owl-s500.dtsi
··· 131 131 compatible = "actions,s500-uart", "actions,owl-uart"; 132 132 reg = <0xb0120000 0x2000>; 133 133 interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>; 134 + clocks = <&cmu CLK_UART0>; 134 135 status = "disabled"; 135 136 }; 136 137 ··· 139 138 compatible = "actions,s500-uart", "actions,owl-uart"; 140 139 reg = <0xb0122000 0x2000>; 141 140 interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>; 141 + clocks = <&cmu CLK_UART1>; 142 142 status = "disabled"; 143 143 }; 144 144 ··· 147 145 compatible = "actions,s500-uart", "actions,owl-uart"; 148 146 reg = <0xb0124000 0x2000>; 149 147 interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>; 148 + clocks = <&cmu CLK_UART2>; 150 149 status = "disabled"; 151 150 }; 152 151 ··· 155 152 compatible = "actions,s500-uart", "actions,owl-uart"; 156 153 reg = <0xb0126000 0x2000>; 157 154 interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>; 155 + clocks = <&cmu CLK_UART3>; 158 156 status = "disabled"; 159 157 }; 160 158 ··· 163 159 compatible = "actions,s500-uart", "actions,owl-uart"; 164 160 reg = <0xb0128000 0x2000>; 165 161 interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>; 162 + clocks = <&cmu CLK_UART4>; 166 163 status = "disabled"; 167 164 }; 168 165 ··· 171 166 compatible = "actions,s500-uart", "actions,owl-uart"; 172 167 reg = <0xb012a000 0x2000>; 173 168 interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>; 169 + clocks = <&cmu CLK_UART5>; 174 170 status = "disabled"; 175 171 }; 176 172 ··· 179 173 compatible = "actions,s500-uart", "actions,owl-uart"; 180 174 reg = <0xb012c000 0x2000>; 181 175 interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>; 176 + clocks = <&cmu CLK_UART6>; 182 177 status = "disabled"; 183 178 }; 184 179