aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/exynos5250.dtsi
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2013-03-09 16:56:34 +0900
committerKukjin Kim <kgene.kim@samsung.com>2013-03-09 16:56:34 +0900
commit8ec46b97f24d60645c8f708c87e0caecebd25d77 (patch)
tree3663c411f7a4e7a9bfc0a8e720679b93a5860b7c /arch/arm/boot/dts/exynos5250.dtsi
parentb85b64cc22122adca695e0f8c340cc677ad92e8c (diff)
parent6938d75a8c1a1752f9fa7ef14a0c570036c7b73b (diff)
downloadvexpress-lsk-8ec46b97f24d60645c8f708c87e0caecebd25d77.tar.gz
Merge branch 'next/mct-exynos' into next/clk-exynos
Conflicts: arch/arm/mach-exynos/mach-exynos4-dt.c
Diffstat (limited to 'arch/arm/boot/dts/exynos5250.dtsi')
-rw-r--r--arch/arm/boot/dts/exynos5250.dtsi22
1 files changed, 22 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index 37a90dd6a4d..4fe76bf299f 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -79,6 +79,28 @@
<0 28 0>, <0 29 0>, <0 30 0>, <0 31 0>;
};
+ mct@101C0000 {
+ compatible = "samsung,exynos4210-mct";
+ reg = <0x101C0000 0x800>;
+ interrupt-controller;
+ #interrups-cells = <2>;
+ interrupt-parent = <&mct_map>;
+ interrupts = <0 0>, <1 0>, <2 0>, <3 0>,
+ <4 0>, <5 0>;
+
+ mct_map: mct-map {
+ #interrupt-cells = <2>;
+ #address-cells = <0>;
+ #size-cells = <0>;
+ interrupt-map = <0x0 0 &combiner 23 3>,
+ <0x1 0 &combiner 23 4>,
+ <0x2 0 &combiner 25 2>,
+ <0x3 0 &combiner 25 3>,
+ <0x4 0 &gic 0 120 0>,
+ <0x5 0 &gic 0 121 0>;
+ };
+ };
+
watchdog {
compatible = "samsung,s3c2410-wdt";
reg = <0x101D0000 0x100>;