ARM: dts: r8a7794: Add BRG support for (H)SCIF

Add the device node for the external SCIF_CLK.
The presence of the SCIF_CLK crystal and its clock frequency depends on
the actual board.

Add the two optional clock sources (ZS_CLK and SCIF_CLK for the internal
resp. external clock) for the Baud Rate Generator for External Clock
(BRG) to all SCIF and HSCIF device nodes.

This increases the range and accuracy of supported baud rates on
(H)SCIF.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi
index b03a77b3d22f13d2e9059b1fd7902c346c5402e9..7d4c5597af5b54bd76d55f766324f8ff7985ea4e 100644 (file)
--- a/arch/arm/boot/dts/r8a7794.dtsi
+++ b/arch/arm/boot/dts/r8a7794.dtsi
@@ -403,8 +403,9 @@
                             "renesas,scif";
                reg = <0 0xe6e60000 0 64>;
                interrupts = <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&mstp7_clks R8A7794_CLK_SCIF0>;
-               clock-names = "fck";
+               clocks = <&mstp7_clks R8A7794_CLK_SCIF0>, <&zs_clk>,
+                        <&scif_clk>;
+               clock-names = "fck", "brg_int", "scif_clk";
                dmas = <&dmac0 0x29>, <&dmac0 0x2a>;
                dma-names = "tx", "rx";
                power-domains = <&cpg_clocks>;
@@ -416,8 +417,9 @@
                             "renesas,scif";
                reg = <0 0xe6e68000 0 64>;
                interrupts = <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&mstp7_clks R8A7794_CLK_SCIF1>;
-               clock-names = "fck";
+               clocks = <&mstp7_clks R8A7794_CLK_SCIF1>, <&zs_clk>,
+                        <&scif_clk>;
+               clock-names = "fck", "brg_int", "scif_clk";
                dmas = <&dmac0 0x2d>, <&dmac0 0x2e>;
                dma-names = "tx", "rx";
                power-domains = <&cpg_clocks>;
@@ -429,8 +431,9 @@
                             "renesas,scif";
                reg = <0 0xe6e58000 0 64>;
                interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&mstp7_clks R8A7794_CLK_SCIF2>;
-               clock-names = "fck";
+               clocks = <&mstp7_clks R8A7794_CLK_SCIF2>, <&zs_clk>,
+                        <&scif_clk>;
+               clock-names = "fck", "brg_int", "scif_clk";
                dmas = <&dmac0 0x2b>, <&dmac0 0x2c>;
                dma-names = "tx", "rx";
                power-domains = <&cpg_clocks>;
@@ -442,8 +445,9 @@
                             "renesas,scif";
                reg = <0 0xe6ea8000 0 64>;
                interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&mstp7_clks R8A7794_CLK_SCIF3>;
-               clock-names = "fck";
+               clocks = <&mstp7_clks R8A7794_CLK_SCIF3>, <&zs_clk>,
+                        <&scif_clk>;
+               clock-names = "fck", "brg_int", "scif_clk";
                dmas = <&dmac0 0x2f>, <&dmac0 0x30>;
                dma-names = "tx", "rx";
                power-domains = <&cpg_clocks>;
@@ -455,8 +459,9 @@
                             "renesas,scif";
                reg = <0 0xe6ee0000 0 64>;
                interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&mstp7_clks R8A7794_CLK_SCIF4>;
-               clock-names = "fck";
+               clocks = <&mstp7_clks R8A7794_CLK_SCIF4>, <&zs_clk>,
+                        <&scif_clk>;
+               clock-names = "fck", "brg_int", "scif_clk";
                dmas = <&dmac0 0xfb>, <&dmac0 0xfc>;
                dma-names = "tx", "rx";
                power-domains = <&cpg_clocks>;
@@ -468,8 +473,9 @@
                             "renesas,scif";
                reg = <0 0xe6ee8000 0 64>;
                interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&mstp7_clks R8A7794_CLK_SCIF5>;
-               clock-names = "fck";
+               clocks = <&mstp7_clks R8A7794_CLK_SCIF5>, <&zs_clk>,
+                        <&scif_clk>;
+               clock-names = "fck", "brg_int", "scif_clk";
                dmas = <&dmac0 0xfd>, <&dmac0 0xfe>;
                dma-names = "tx", "rx";
                power-domains = <&cpg_clocks>;
@@ -481,8 +487,9 @@
                             "renesas,rcar-gen2-hscif", "renesas,hscif";
                reg = <0 0xe62c0000 0 96>;
                interrupts = <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&mstp7_clks R8A7794_CLK_HSCIF0>;
-               clock-names = "fck";
+               clocks = <&mstp7_clks R8A7794_CLK_HSCIF0>, <&zs_clk>,
+                        <&scif_clk>;
+               clock-names = "fck", "brg_int", "scif_clk";
                dmas = <&dmac0 0x39>, <&dmac0 0x3a>;
                dma-names = "tx", "rx";
                power-domains = <&cpg_clocks>;
@@ -494,8 +501,9 @@
                             "renesas,rcar-gen2-hscif", "renesas,hscif";
                reg = <0 0xe62c8000 0 96>;
                interrupts = <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&mstp7_clks R8A7794_CLK_HSCIF1>;
-               clock-names = "fck";
+               clocks = <&mstp7_clks R8A7794_CLK_HSCIF1>, <&zs_clk>,
+                        <&scif_clk>;
+               clock-names = "fck", "brg_int", "scif_clk";
                dmas = <&dmac0 0x4d>, <&dmac0 0x4e>;
                dma-names = "tx", "rx";
                power-domains = <&cpg_clocks>;
@@ -507,8 +515,9 @@
                             "renesas,rcar-gen2-hscif", "renesas,hscif";
                reg = <0 0xe62d0000 0 96>;
                interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&mstp7_clks R8A7794_CLK_HSCIF2>;
-               clock-names = "fck";
+               clocks = <&mstp7_clks R8A7794_CLK_HSCIF2>, <&zs_clk>,
+                        <&scif_clk>;
+               clock-names = "fck", "brg_int", "scif_clk";
                dmas = <&dmac0 0x3b>, <&dmac0 0x3c>;
                dma-names = "tx", "rx";
                power-domains = <&cpg_clocks>;
@@ -815,6 +824,15 @@
                        clock-output-names = "extal";
                };
 
+               /* External SCIF clock */
+               scif_clk: scif {
+                       compatible = "fixed-clock";
+                       #clock-cells = <0>;
+                       /* This value must be overridden by the board. */
+                       clock-frequency = <0>;
+                       status = "disabled";
+               };
+
                /* Special CPG clocks */
                cpg_clocks: cpg_clocks@e6150000 {
                        compatible = "renesas,r8a7794-cpg-clocks",