diff options
author | Jason Cooper <jason@lakedaemon.net> | 2015-04-10 22:57:58 +0000 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2015-04-10 22:57:58 +0000 |
commit | fb414e908b15ae3d704aa0572f77981a516279b9 (patch) | |
tree | d0e464382dee546548ddc0d5a06b961d09a33da2 /arch/arm/boot/dts/exynos5420.dtsi | |
parent | 07c523f1493b6860662e74a3d7e1ae0e7d67d416 (diff) | |
parent | d4ad0759cdb1c2d0971801f8876365dddea56695 (diff) | |
download | linux-next-fb414e908b15ae3d704aa0572f77981a516279b9.tar.gz |
Merge branch 'irqchip/stacked-exynos' into irqchip/core
Diffstat (limited to 'arch/arm/boot/dts/exynos5420.dtsi')
-rw-r--r-- | arch/arm/boot/dts/exynos5420.dtsi | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi index 9dc2e9773b30..d11a6ab4ecd2 100644 --- a/arch/arm/boot/dts/exynos5420.dtsi +++ b/arch/arm/boot/dts/exynos5420.dtsi @@ -327,6 +327,7 @@ rtc: rtc@101E0000 { clocks = <&clock CLK_RTC>; clock-names = "rtc"; + interrupt-parent = <&pmu_system_controller>; status = "disabled"; }; @@ -769,6 +770,9 @@ clock-names = "clkout16"; clocks = <&clock CLK_FIN_PLL>; #clock-cells = <1>; + interrupt-controller; + #interrupt-cells = <3>; + interrupt-parent = <&gic>; }; sysreg_system_controller: syscon@10050000 { |