Merge branch 'next/mct-exynos' into next/clk-exynos

Conflicts: arch/arm/mach-exynos/mach-exynos4-dt.c
author: Kukjin Kim <kgene.kim@samsung.com> 2013-03-09 02:56:34 -0500
committer: Kukjin Kim <kgene.kim@samsung.com> 2013-03-09 02:56:34 -0500
commit: 8ec46b97f24d60645c8f708c87e0caecebd25d77 (patch)
tree: 3663c411f7a4e7a9bfc0a8e720679b93a5860b7c /arch/arm/boot/dts
parent: b85b64cc22122adca695e0f8c340cc677ad92e8c (diff)
parent: 6938d75a8c1a1752f9fa7ef14a0c570036c7b73b (diff)
4 files changed, 90 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi
index 2feffc70814c..49a2786e00b9 100644
--- a/arch/arm/boot/dts/exynos4210.dtsi
+++ b/arch/arm/boot/dts/exynos4210.dtsi
@@ -47,6 +47,28 @@
                             <0 12 0>, <0 13 0>, <0 14 0>, <0 15 0>;
        };
+        mct@10050000 {
+                compatible = "samsung,exynos4210-mct";
+                reg = <0x10050000 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 &gic 0 57 0>,
+                                        <0x1 0 &gic 0 69 0>,
+                                        <0x2 0 &combiner 12 6>,
+                                        <0x3 0 &combiner 12 7>,
+                                        <0x4 0 &gic 0 42 0>,
+                                        <0x5 0 &gic 0 48 0>;
+                };
+        };
        pinctrl_0: pinctrl@11400000 {
                compatible = "samsung,exynos4210-pinctrl";
                reg = <0x11400000 0x1000>;
diff --git a/arch/arm/boot/dts/exynos4212.dtsi b/arch/arm/boot/dts/exynos4212.dtsi
index c6ae2005961f..36d4299789ef 100644
--- a/arch/arm/boot/dts/exynos4212.dtsi
+++ b/arch/arm/boot/dts/exynos4212.dtsi
@@ -25,4 +25,26 @@
        gic:interrupt-controller@10490000 {
                cpu-offset = <0x8000>;
        };
+        mct@10050000 {
+                compatible = "samsung,exynos4412-mct";
+                reg = <0x10050000 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 &gic 0 57 0>,
+                                        <0x1 0 &combiner 12 5>,
+                                        <0x2 0 &combiner 12 6>,
+                                        <0x3 0 &combiner 12 7>,
+                                        <0x4 0 &gic 1 12 0>,
+                                        <0x5 0 &gic 1 12 0>;
+                };
+        };
 };
diff --git a/arch/arm/boot/dts/exynos4412.dtsi b/arch/arm/boot/dts/exynos4412.dtsi
index d7dfe312772a..821c9fdd1e3b 100644
--- a/arch/arm/boot/dts/exynos4412.dtsi
+++ b/arch/arm/boot/dts/exynos4412.dtsi
@@ -25,4 +25,28 @@
        gic:interrupt-controller@10490000 {
                cpu-offset = <0x4000>;
        };
+        mct@10050000 {
+                compatible = "samsung,exynos4412-mct";
+                reg = <0x10050000 0x800>;
+                interrupt-controller;
+                #interrups-cells = <2>;
+                interrupt-parent = <&mct_map>;
+                interrupts = <0 0>, <1 0>, <2 0>, <3 0>,
+                             <4 0>, <5 0>, <6 0>, <7 0>;
+                mct_map: mct-map {
+                        #interrupt-cells = <2>;
+                        #address-cells = <0>;
+                        #size-cells = <0>;
+                        interrupt-map = <0x0 0 &gic 0 57 0>,
+                                        <0x1 0 &combiner 12 5>,
+                                        <0x2 0 &combiner 12 6>,
+                                        <0x3 0 &combiner 12 7>,
+                                        <0x4 0 &gic 1 12 0>,
+                                        <0x5 0 &gic 1 12 0>,
+                                        <0x6 0 &gic 1 12 0>,
+                                        <0x7 0 &gic 1 12 0>;
+                };
+        };
 };
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index 37a90dd6a4d2..4fe76bf299fb 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>;
author	Kukjin Kim <kgene.kim@samsung.com>	2013-03-09 02:56:34 -0500
committer	Kukjin Kim <kgene.kim@samsung.com>	2013-03-09 02:56:34 -0500
commit	8ec46b97f24d60645c8f708c87e0caecebd25d77 (patch)
tree	3663c411f7a4e7a9bfc0a8e720679b93a5860b7c /arch/arm/boot/dts
parent	b85b64cc22122adca695e0f8c340cc677ad92e8c (diff)
parent	6938d75a8c1a1752f9fa7ef14a0c570036c7b73b (diff)

diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi index 2feffc70814c..49a2786e00b9 100644 --- a/arch/arm/boot/dts/exynos4210.dtsi +++ b/arch/arm/boot/dts/exynos4210.dtsi
@@ -47,6 +47,28 @@
47	<0 12 0>, <0 13 0>, <0 14 0>, <0 15 0>;	47	<0 12 0>, <0 13 0>, <0 14 0>, <0 15 0>;
48	};	48	};
49		49
		50	mct@10050000 {
		51	compatible = "samsung,exynos4210-mct";
		52	reg = <0x10050000 0x800>;
		53	interrupt-controller;
		54	#interrups-cells = <2>;
		55	interrupt-parent = <&mct_map>;
		56	interrupts = <0 0>, <1 0>, <2 0>, <3 0>,
		57	<4 0>, <5 0>;
		58
		59	mct_map: mct-map {
		60	#interrupt-cells = <2>;
		61	#address-cells = <0>;
		62	#size-cells = <0>;
		63	interrupt-map = <0x0 0 &gic 0 57 0>,
		64	<0x1 0 &gic 0 69 0>,
		65	<0x2 0 &combiner 12 6>,
		66	<0x3 0 &combiner 12 7>,
		67	<0x4 0 &gic 0 42 0>,
		68	<0x5 0 &gic 0 48 0>;
		69	};
		70	};
		71
50	pinctrl_0: pinctrl@11400000 {	72	pinctrl_0: pinctrl@11400000 {
51	compatible = "samsung,exynos4210-pinctrl";	73	compatible = "samsung,exynos4210-pinctrl";
52	reg = <0x11400000 0x1000>;	74	reg = <0x11400000 0x1000>;


diff --git a/arch/arm/boot/dts/exynos4212.dtsi b/arch/arm/boot/dts/exynos4212.dtsi index c6ae2005961f..36d4299789ef 100644 --- a/arch/arm/boot/dts/exynos4212.dtsi +++ b/arch/arm/boot/dts/exynos4212.dtsi
@@ -25,4 +25,26 @@
25	gic:interrupt-controller@10490000 {	25	gic:interrupt-controller@10490000 {
26	cpu-offset = <0x8000>;	26	cpu-offset = <0x8000>;
27	};	27	};
		28
		29	mct@10050000 {
		30	compatible = "samsung,exynos4412-mct";
		31	reg = <0x10050000 0x800>;
		32	interrupt-controller;
		33	#interrups-cells = <2>;
		34	interrupt-parent = <&mct_map>;
		35	interrupts = <0 0>, <1 0>, <2 0>, <3 0>,
		36	<4 0>, <5 0>;
		37
		38	mct_map: mct-map {
		39	#interrupt-cells = <2>;
		40	#address-cells = <0>;
		41	#size-cells = <0>;
		42	interrupt-map = <0x0 0 &gic 0 57 0>,
		43	<0x1 0 &combiner 12 5>,
		44	<0x2 0 &combiner 12 6>,
		45	<0x3 0 &combiner 12 7>,
		46	<0x4 0 &gic 1 12 0>,
		47	<0x5 0 &gic 1 12 0>;
		48	};
		49	};
28	};	50	};


diff --git a/arch/arm/boot/dts/exynos4412.dtsi b/arch/arm/boot/dts/exynos4412.dtsi index d7dfe312772a..821c9fdd1e3b 100644 --- a/arch/arm/boot/dts/exynos4412.dtsi +++ b/arch/arm/boot/dts/exynos4412.dtsi
@@ -25,4 +25,28 @@
25	gic:interrupt-controller@10490000 {	25	gic:interrupt-controller@10490000 {
26	cpu-offset = <0x4000>;	26	cpu-offset = <0x4000>;
27	};	27	};
		28
		29	mct@10050000 {
		30	compatible = "samsung,exynos4412-mct";
		31	reg = <0x10050000 0x800>;
		32	interrupt-controller;
		33	#interrups-cells = <2>;
		34	interrupt-parent = <&mct_map>;
		35	interrupts = <0 0>, <1 0>, <2 0>, <3 0>,
		36	<4 0>, <5 0>, <6 0>, <7 0>;
		37
		38	mct_map: mct-map {
		39	#interrupt-cells = <2>;
		40	#address-cells = <0>;
		41	#size-cells = <0>;
		42	interrupt-map = <0x0 0 &gic 0 57 0>,
		43	<0x1 0 &combiner 12 5>,
		44	<0x2 0 &combiner 12 6>,
		45	<0x3 0 &combiner 12 7>,
		46	<0x4 0 &gic 1 12 0>,
		47	<0x5 0 &gic 1 12 0>,
		48	<0x6 0 &gic 1 12 0>,
		49	<0x7 0 &gic 1 12 0>;
		50	};
		51	};
28	};	52	};


diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi index 37a90dd6a4d2..4fe76bf299fb 100644 --- a/arch/arm/boot/dts/exynos5250.dtsi +++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -79,6 +79,28 @@
79	<0 28 0>, <0 29 0>, <0 30 0>, <0 31 0>;	79	<0 28 0>, <0 29 0>, <0 30 0>, <0 31 0>;
80	};	80	};
81		81
		82	mct@101C0000 {
		83	compatible = "samsung,exynos4210-mct";
		84	reg = <0x101C0000 0x800>;
		85	interrupt-controller;
		86	#interrups-cells = <2>;
		87	interrupt-parent = <&mct_map>;
		88	interrupts = <0 0>, <1 0>, <2 0>, <3 0>,
		89	<4 0>, <5 0>;
		90
		91	mct_map: mct-map {
		92	#interrupt-cells = <2>;
		93	#address-cells = <0>;
		94	#size-cells = <0>;
		95	interrupt-map = <0x0 0 &combiner 23 3>,
		96	<0x1 0 &combiner 23 4>,
		97	<0x2 0 &combiner 25 2>,
		98	<0x3 0 &combiner 25 3>,
		99	<0x4 0 &gic 0 120 0>,
		100	<0x5 0 &gic 0 121 0>;
		101	};
		102	};
		103
82	watchdog {	104	watchdog {
83	compatible = "samsung,s3c2410-wdt";	105	compatible = "samsung,s3c2410-wdt";
84	reg = <0x101D0000 0x100>;	106	reg = <0x101D0000 0x100>;