summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/exynos4.dtsi
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2015-04-11 11:17:28 +0200
committerThomas Gleixner <tglx@linutronix.de>2015-04-11 11:17:28 +0200
commitb7dccbea6b079be01e07921264709f249009b8e8 (patch)
tree25997ac6fb2741fb310cf03ebbdb79014fbbd238 /arch/arm/boot/dts/exynos4.dtsi
parentMerge tag 'irqchip-core-4.1-2' of git://git.infradead.org/users/jcooper/linux... (diff)
parentMerge branch 'irqchip/stacked-irq_set_wake' into irqchip/core (diff)
downloadlinux-b7dccbea6b079be01e07921264709f249009b8e8.tar.xz
linux-b7dccbea6b079be01e07921264709f249009b8e8.zip
Merge tag 'irqchip-core-4.1-3' of git://git.infradead.org/users/jcooper/linux into irq/core
irqchip core change for v4.1 (round 3) from Jason Cooper Purge the gic_arch_extn hacks and abuse by using the new stacked domains NOTE: Due to the nature of these changes, patches crossing subsystems have been kept together in their own branches. - tegra - Handle the LIC properly - omap - Convert crossbar to stacked domains - kill arm,routable-irqs in GIC binding - exynos - Convert PMU wakeup to stacked domains - shmobile, ux500, zynq (irq_set_wake branch) - Switch from abusing gic_arch_extn to using gic_set_irqchip_flags
Diffstat (limited to 'arch/arm/boot/dts/exynos4.dtsi')
-rw-r--r--arch/arm/boot/dts/exynos4.dtsi4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index 77ea547768f4..e20cdc24c3bb 100644
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -154,6 +154,9 @@
pmu_system_controller: system-controller@10020000 {
compatible = "samsung,exynos4210-pmu", "syscon";
reg = <0x10020000 0x4000>;
+ interrupt-controller;
+ #interrupt-cells = <3>;
+ interrupt-parent = <&gic>;
};
dsi_0: dsi@11C80000 {
@@ -266,6 +269,7 @@
rtc@10070000 {
compatible = "samsung,s3c6410-rtc";
reg = <0x10070000 0x100>;
+ interrupt-parent = <&pmu_system_controller>;
interrupts = <0 44 0>, <0 45 0>;
clocks = <&clock CLK_RTC>;
clock-names = "rtc";