[PATCH v1 04/04] arm: dts: actions: Set UART clock reference from CMU for Actions Semi S500 SoC
From: Edgar Bernardi Righi <hidden>
Date: 2018-07-18 16:22:10
Also in:
linux-arm-kernel, linux-clk, lkml
Set UART clock reference from CMU for Actions Semi S500 SoC. Tested on a Lemaker Guitar board. File(s) updated: "/arch/arm/boot/dts/owl-s500.dtsi", "/arch/arm/boot/dts/owl-s500-cubieboard6.dts", "/arch/arm/boot/dts/owl-s500-guitar-bb-rev-b.dts", "/arch/arm/boot/dts/owl-s500-sparky.dts" Signed-off-by: Edgar Bernardi Righi <redacted> diff -uprN -X vanilla/Documentation/dontdiff vanilla/arch/arm/boot/dts/owl-s500-cubieboard6.dts linux/arch/arm/boot/dts/owl-s500-cubieboard6.dts
--- vanilla/arch/arm/boot/dts/owl-s500-cubieboard6.dts 2018-07-1713:07:15.675710511 -0300
+++ linux/arch/arm/boot/dts/owl-s500-cubieboard6.dts 2018-07-1716:42:53.202336000 -0300
@@ -26,12 +26,6 @@ device_type = "memory"; reg = <0x0 0x80000000>; }; - - uart3_clk: uart3-clk { - compatible = "fixed-clock"; - clock-frequency = <921600>; - #clock-cells = <0>; - }; }; &timer {
@@ -40,5 +34,5 @@ &uart3 { status = "okay"; - clocks = <&uart3_clk>; }; +
diff -uprN -X vanilla/Documentation/dontdiff vanilla/arch/arm/boot/dts/owl-s500.dtsi linux/arch/arm/boot/dts/owl-s500.dtsi
--- vanilla/arch/arm/boot/dts/owl-s500.dtsi 2018-07-1812:51:07.875364441 -0300
+++ linux/arch/arm/boot/dts/owl-s500.dtsi 2018-07-17 16:43:47.786063000 -0300@@ -133,6 +133,7 @@ compatible = "actions,s500-uart", "actions,owl-uart"; reg = <0xb0120000 0x2000>; interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cmu CLK_UART0>; status = "disabled"; };
@@ -140,6 +141,7 @@ compatible = "actions,s500-uart", "actions,owl-uart"; reg = <0xb0122000 0x2000>; interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cmu CLK_UART1>; status = "disabled"; };
@@ -147,6 +149,7 @@ compatible = "actions,s500-uart", "actions,owl-uart"; reg = <0xb0124000 0x2000>; interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cmu CLK_UART2>; status = "disabled"; };
@@ -154,6 +157,7 @@ compatible = "actions,s500-uart", "actions,owl-uart"; reg = <0xb0126000 0x2000>; interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cmu CLK_UART3>; status = "disabled"; };
@@ -161,6 +165,7 @@ compatible = "actions,s500-uart", "actions,owl-uart"; reg = <0xb0128000 0x2000>; interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cmu CLK_UART4>; status = "disabled"; };
@@ -168,6 +173,7 @@ compatible = "actions,s500-uart", "actions,owl-uart"; reg = <0xb012a000 0x2000>; interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cmu CLK_UART5>; status = "disabled"; };
@@ -175,6 +181,7 @@ compatible = "actions,s500-uart", "actions,owl-uart"; reg = <0xb012c000 0x2000>; interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cmu CLK_UART6>; status = "disabled"; };
@@ -182,6 +189,8 @@ compatible = "actions,s500-cmu"; reg = <0xb0160000 0x8000>; clocks = <&hosc>, <&losc>; + clock-indices = <CLK_UART0>, <CLK_UART1>, <CLK_UART2>, + <CLK_UART3>, <CLK_UART4>, <CLK_UART5>, <CLK_UART6>; #clock-cells = <1>; };
diff -uprN -X vanilla/Documentation/dontdiff vanilla/arch/arm/boot/dts/owl-s500-guitar-bb-rev-b.dts linux/arch/arm/boot/dts/owl-s500-guitar-bb-rev-b.dts
--- vanilla/arch/arm/boot/dts/owl-s500-guitar-bb-rev-b.dts2018-07-17 13:07:15.675710511 -0300
+++ linux/arch/arm/boot/dts/owl-s500-guitar-bb-rev-b.dts 2018-07-1813:15:24.956371706 -0300
@@ -1,5 +1,6 @@ /* * Copyright (c) 2016-2017 Andreas Färber + * Copyright (c) 2018-2018 Edgar Bernardi Righi * * SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
@@ -19,15 +20,9 @@ chosen { stdout-path = "serial3:115200n8"; }; - - uart3_clk: uart3-clk { - compatible = "fixed-clock"; - clock-frequency = <921600>; - #clock-cells = <0>; - }; }; &uart3 { status = "okay"; - clocks = <&uart3_clk>; }; +
diff -uprN -X vanilla/Documentation/dontdiff vanilla/arch/arm/boot/dts/owl-s500-sparky.dts linux/arch/arm/boot/dts/owl-s500-sparky.dts
--- vanilla/arch/arm/boot/dts/owl-s500-sparky.dts 2018-07-1713:07:15.675710511 -0300
+++ linux/arch/arm/boot/dts/owl-s500-sparky.dts 2018-07-1611:53:58.799410000 -0300
@@ -25,12 +25,6 @@ device_type = "memory"; reg = <0x0 0x40000000>; /* 1 or 2 GiB */ }; - - uart3_clk: uart3-clk { - compatible = "fixed-clock"; - clock-frequency = <921600>; - #clock-cells = <0>; - }; }; &timer {
@@ -39,5 +33,4 @@ &uart3 { status = "okay"; - clocks = <&uart3_clk>; };