ARM: dts: r8a7794: Add INTC-SYS clock to device tree

Link the ARM GIC to the INTC-SYS module clock, and add it to the "always
on" PM Domain, so it can be power managed using that clock.

Note that currently the GIC-400 driver doesn't support module clocks nor
Runtime PM, so this must be handled as a critical clock.

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 cb31cd2232f9166f236dfcc7243fad7f7f7d1e7d..38bf9ed8e739ea2bbccc499a2170d9e2c0a9bff6 100644 (file)
--- a/arch/arm/boot/dts/r8a7794.dtsi
+++ b/arch/arm/boot/dts/r8a7794.dtsi
@@ -74,6 +74,9 @@ gic: interrupt-controller@f1001000 {
                        <0 0xf1004000 0 0x2000>,
                        <0 0xf1006000 0 0x2000>;
                interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>;
+               clocks = <&mstp4_clks R8A7794_CLK_INTC_SYS>;
+               clock-names = "clk";
+               power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
        };
 
        gpio0: gpio@e6050000 {
@@ -1247,10 +1250,10 @@ R8A7794_CLK_USBDMAC0 R8A7794_CLK_USBDMAC1
                mstp4_clks: mstp4_clks@e6150140 {
                        compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks";
                        reg = <0 0xe6150140 0 4>, <0 0xe615004c 0 4>;
-                       clocks = <&cp_clk>;
+                       clocks = <&cp_clk>, <&zs_clk>;
                        #clock-cells = <1>;
-                       clock-indices = <R8A7794_CLK_IRQC>;
-                       clock-output-names = "irqc";
+                       clock-indices = <R8A7794_CLK_IRQC R8A7794_CLK_INTC_SYS>;
+                       clock-output-names = "irqc", "intc-sys";
                };
                mstp5_clks: mstp5_clks@e6150144 {
                        compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks";

diff --git a/include/dt-bindings/clock/r8a7794-clock.h b/include/dt-bindings/clock/r8a7794-clock.h
index 88e64846cf370ff4a32c8423b5d00833c8cb5a81..a26776f7deddbaa41c27aeb0ab49a3a39dc4ab9b 100644 (file)
--- a/include/dt-bindings/clock/r8a7794-clock.h
+++ b/include/dt-bindings/clock/r8a7794-clock.h
@@ -64,6 +64,7 @@
 
 /* MSTP4 */
 #define R8A7794_CLK_IRQC               7
+#define R8A7794_CLK_INTC_SYS           8
 
 /* MSTP5 */
 #define R8A7794_CLK_AUDIO_DMAC0                2