| From 8cf2f36fc62ea403b4bfb89664fef5af6e5b108c Mon Sep 17 00:00:00 2001 |
| From: Geert Uytterhoeven <geert+renesas@glider.be> |
| Date: Mon, 6 Mar 2017 17:58:11 +0100 |
| Subject: [PATCH 069/286] 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> |
| (cherry picked from commit 133a3f1a19c99218a39e9d3e91e9e5442fa0f191) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/boot/dts/r8a7794.dtsi | 9 ++++++--- |
| include/dt-bindings/clock/r8a7794-clock.h | 1 + |
| 2 files changed, 7 insertions(+), 3 deletions(-) |
| |
| --- a/arch/arm/boot/dts/r8a7794.dtsi |
| +++ b/arch/arm/boot/dts/r8a7794.dtsi |
| @@ -74,6 +74,9 @@ |
| <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 @@ |
| 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"; |
| --- 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 |
