From: Kukjin Kim <kgene.kim@samsung.com>
Date: Mon, 19 Nov 2012 04:18:47 +0000 (+0900)
Subject: Merge branch 'next/dt-exynos4x12' into next/dt-samsung
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=326f3abf19360014dfae968aa3ab891d25599618;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'next/dt-exynos4x12' into next/dt-samsung

Conflicts:
	arch/arm/boot/dts/exynos4210.dtsi
---

326f3abf19360014dfae968aa3ab891d25599618
diff --cc arch/arm/boot/dts/exynos4210.dtsi
index 038de97b35f7,d877dbe7ac0e..939f6399c9c7
--- a/arch/arm/boot/dts/exynos4210.dtsi
+++ b/arch/arm/boot/dts/exynos4210.dtsi
@@@ -74,240 -64,4 +64,11 @@@
  		compatible = "samsung,pinctrl-exynos4210";
  		reg = <0x03860000 0x1000>;
  	};
 +
- 	gpio-controllers {
- 		#address-cells = <1>;
- 		#size-cells = <1>;
- 		gpio-controller;
- 		ranges;
- 
- 		gpa0: gpio-controller@11400000 {
- 			compatible = "samsung,exynos4-gpio";
- 			reg = <0x11400000 0x20>;
- 			#gpio-cells = <4>;
- 		};
- 
- 		gpa1: gpio-controller@11400020 {
- 			compatible = "samsung,exynos4-gpio";
- 			reg = <0x11400020 0x20>;
- 			#gpio-cells = <4>;
- 		};
- 
- 		gpb: gpio-controller@11400040 {
- 			compatible = "samsung,exynos4-gpio";
- 			reg = <0x11400040 0x20>;
- 			#gpio-cells = <4>;
- 		};
- 
- 		gpc0: gpio-controller@11400060 {
- 			compatible = "samsung,exynos4-gpio";
- 			reg = <0x11400060 0x20>;
- 			#gpio-cells = <4>;
- 		};
- 
- 		gpc1: gpio-controller@11400080 {
- 			compatible = "samsung,exynos4-gpio";
- 			reg = <0x11400080 0x20>;
- 			#gpio-cells = <4>;
- 		};
- 
- 		gpd0: gpio-controller@114000A0 {
- 			compatible = "samsung,exynos4-gpio";
- 			reg = <0x114000A0 0x20>;
- 			#gpio-cells = <4>;
- 		};
- 
- 		gpd1: gpio-controller@114000C0 {
- 			compatible = "samsung,exynos4-gpio";
- 			reg = <0x114000C0 0x20>;
- 			#gpio-cells = <4>;
- 		};
- 
- 		gpe0: gpio-controller@114000E0 {
- 			compatible = "samsung,exynos4-gpio";
- 			reg = <0x114000E0 0x20>;
- 			#gpio-cells = <4>;
- 		};
- 
- 		gpe1: gpio-controller@11400100 {
- 			compatible = "samsung,exynos4-gpio";
- 			reg = <0x11400100 0x20>;
- 			#gpio-cells = <4>;
- 		};
- 
- 		gpe2: gpio-controller@11400120 {
- 			compatible = "samsung,exynos4-gpio";
- 			reg = <0x11400120 0x20>;
- 			#gpio-cells = <4>;
- 		};
- 
- 		gpe3: gpio-controller@11400140 {
- 			compatible = "samsung,exynos4-gpio";
- 			reg = <0x11400140 0x20>;
- 			#gpio-cells = <4>;
- 		};
- 
- 		gpe4: gpio-controller@11400160 {
- 			compatible = "samsung,exynos4-gpio";
- 			reg = <0x11400160 0x20>;
- 			#gpio-cells = <4>;
- 		};
- 
- 		gpf0: gpio-controller@11400180 {
- 			compatible = "samsung,exynos4-gpio";
- 			reg = <0x11400180 0x20>;
- 			#gpio-cells = <4>;
- 		};
- 
- 		gpf1: gpio-controller@114001A0 {
- 			compatible = "samsung,exynos4-gpio";
- 			reg = <0x114001A0 0x20>;
- 			#gpio-cells = <4>;
- 		};
- 
- 		gpf2: gpio-controller@114001C0 {
- 			compatible = "samsung,exynos4-gpio";
- 			reg = <0x114001C0 0x20>;
- 			#gpio-cells = <4>;
- 		};
- 
- 		gpf3: gpio-controller@114001E0 {
- 			compatible = "samsung,exynos4-gpio";
- 			reg = <0x114001E0 0x20>;
- 			#gpio-cells = <4>;
- 		};
- 
- 		gpj0: gpio-controller@11000000 {
- 			compatible = "samsung,exynos4-gpio";
- 			reg = <0x11000000 0x20>;
- 			#gpio-cells = <4>;
- 		};
- 
- 		gpj1: gpio-controller@11000020 {
- 			compatible = "samsung,exynos4-gpio";
- 			reg = <0x11000020 0x20>;
- 			#gpio-cells = <4>;
- 		};
- 
- 		gpk0: gpio-controller@11000040 {
- 			compatible = "samsung,exynos4-gpio";
- 			reg = <0x11000040 0x20>;
- 			#gpio-cells = <4>;
- 		};
- 
- 		gpk1: gpio-controller@11000060 {
- 			compatible = "samsung,exynos4-gpio";
- 			reg = <0x11000060 0x20>;
- 			#gpio-cells = <4>;
- 		};
- 
- 		gpk2: gpio-controller@11000080 {
- 			compatible = "samsung,exynos4-gpio";
- 			reg = <0x11000080 0x20>;
- 			#gpio-cells = <4>;
- 		};
- 
- 		gpk3: gpio-controller@110000A0 {
- 			compatible = "samsung,exynos4-gpio";
- 			reg = <0x110000A0 0x20>;
- 			#gpio-cells = <4>;
- 		};
- 
- 		gpl0: gpio-controller@110000C0 {
- 			compatible = "samsung,exynos4-gpio";
- 			reg = <0x110000C0 0x20>;
- 			#gpio-cells = <4>;
- 		};
- 
- 		gpl1: gpio-controller@110000E0 {
- 			compatible = "samsung,exynos4-gpio";
- 			reg = <0x110000E0 0x20>;
- 			#gpio-cells = <4>;
- 		};
- 
- 		gpl2: gpio-controller@11000100 {
- 			compatible = "samsung,exynos4-gpio";
- 			reg = <0x11000100 0x20>;
- 			#gpio-cells = <4>;
- 		};
- 
- 		gpy0: gpio-controller@11000120 {
- 			compatible = "samsung,exynos4-gpio";
- 			reg = <0x11000120 0x20>;
- 			#gpio-cells = <4>;
- 		};
- 
- 		gpy1: gpio-controller@11000140 {
- 			compatible = "samsung,exynos4-gpio";
- 			reg = <0x11000140 0x20>;
- 			#gpio-cells = <4>;
- 		};
- 
- 		gpy2: gpio-controller@11000160 {
- 			compatible = "samsung,exynos4-gpio";
- 			reg = <0x11000160 0x20>;
- 			#gpio-cells = <4>;
- 		};
- 
- 		gpy3: gpio-controller@11000180 {
- 			compatible = "samsung,exynos4-gpio";
- 			reg = <0x11000180 0x20>;
- 			#gpio-cells = <4>;
- 		};
- 
- 		gpy4: gpio-controller@110001A0 {
- 			compatible = "samsung,exynos4-gpio";
- 			reg = <0x110001A0 0x20>;
- 			#gpio-cells = <4>;
- 		};
- 
- 		gpy5: gpio-controller@110001C0 {
- 			compatible = "samsung,exynos4-gpio";
- 			reg = <0x110001C0 0x20>;
- 			#gpio-cells = <4>;
- 		};
- 
- 		gpy6: gpio-controller@110001E0 {
- 			compatible = "samsung,exynos4-gpio";
- 			reg = <0x110001E0 0x20>;
- 			#gpio-cells = <4>;
- 		};
- 
- 		gpx0: gpio-controller@11000C00 {
- 			compatible = "samsung,exynos4-gpio";
- 			reg = <0x11000C00 0x20>;
- 			#gpio-cells = <4>;
- 		};
- 
- 		gpx1: gpio-controller@11000C20 {
- 			compatible = "samsung,exynos4-gpio";
- 			reg = <0x11000C20 0x20>;
- 			#gpio-cells = <4>;
- 		};
- 
- 		gpx2: gpio-controller@11000C40 {
- 			compatible = "samsung,exynos4-gpio";
- 			reg = <0x11000C40 0x20>;
- 			#gpio-cells = <4>;
- 		};
- 
- 		gpx3: gpio-controller@11000C60 {
- 			compatible = "samsung,exynos4-gpio";
- 			reg = <0x11000C60 0x20>;
- 			#gpio-cells = <4>;
- 		};
- 
- 		gpz: gpio-controller@03860000 {
- 			compatible = "samsung,exynos4-gpio";
- 			reg = <0x03860000 0x20>;
- 			#gpio-cells = <4>;
- 		};
- 	};
- 
 +	tmu@100C0000 {
 +		compatible = "samsung,exynos4210-tmu";
 +		interrupt-parent = <&combiner>;
 +		reg = <0x100C0000 0x100>;
 +		interrupts = <2 4>;
 +	};
  };