]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ARM: dts: r8a7792: Add INTC-SYS clock to device tree
authorGeert Uytterhoeven <geert+renesas@glider.be>
Mon, 6 Mar 2017 16:58:09 +0000 (17:58 +0100)
committerSimon Horman <horms+renesas@verge.net.au>
Fri, 10 Mar 2017 09:20:25 +0000 (10:20 +0100)
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>
arch/arm/boot/dts/r8a7792.dtsi
include/dt-bindings/clock/r8a7792-clock.h

index c762f44f7732f352d31d2ee4ad3c62616dc22e5b..6c0797ebc08f029c44c56b8ad19de9ec633b6c91 100644 (file)
@@ -92,6 +92,9 @@ gic: interrupt-controller@f1001000 {
                              <0 0xf1006000 0 0x2000>;
                        interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) |
                                      IRQ_TYPE_LEVEL_HIGH)>;
+                       clocks = <&mstp4_clks R8A7792_CLK_INTC_SYS>;
+                       clock-names = "clk";
+                       power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
                };
 
                irqc: interrupt-controller@e61c0000 {
@@ -895,10 +898,12 @@ mstp4_clks: mstp4_clks@e6150140 {
                        compatible = "renesas,r8a7792-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 = <R8A7792_CLK_IRQC>;
-                       clock-output-names = "irqc";
+                       clock-indices = <
+                               R8A7792_CLK_IRQC R8A7792_CLK_INTC_SYS
+                       >;
+                       clock-output-names = "irqc", "intc-sys";
                };
                mstp7_clks: mstp7_clks@e615014c {
                        compatible = "renesas,r8a7792-mstp-clocks",
index 9a8b392ceb000fc3eebbca97d659a877542c0625..94dd16a1e6e6963d8c02972813c138877eb7e4c3 100644 (file)
@@ -45,6 +45,7 @@
 
 /* MSTP4 */
 #define R8A7792_CLK_IRQC               7
+#define R8A7792_CLK_INTC_SYS           8
 
 /* MSTP5 */
 #define R8A7792_CLK_AUDIO_DMAC0                2