Merge git://git.denx.de/u-boot-dm

1 files changed, 27 insertions, 27 deletions

diff --git a/arch/arm/dts/exynos4x12-pinctrl.dtsi b/arch/arm/dts/exynos4x12-pinctrl.dtsi
index 93f39983b4..23061351ff 100644
--- a/arch/arm/dts/exynos4x12-pinctrl.dtsi
+++ b/arch/arm/dts/exynos4x12-pinctrl.dtsi
@@ -176,79 +176,79 @@
 			#interrupt-cells = <2>;
 		};
 
-		gpm0: gpm0 {
+		gpy0: gpy0 {
 			gpio-controller;
 			#gpio-cells = <2>;
-
-			interrupt-controller;
-			#interrupt-cells = <2>;
 		};
 
-		gpm1: gpm1 {
+		gpy1: gpy1 {
 			gpio-controller;
 			#gpio-cells = <2>;
-
-			interrupt-controller;
-			#interrupt-cells = <2>;
 		};
 
-		gpm2: gpm2 {
+		gpy2: gpy2 {
 			gpio-controller;
 			#gpio-cells = <2>;
-
-			interrupt-controller;
-			#interrupt-cells = <2>;
 		};
 
-		gpm3: gpm3 {
+		gpy3: gpy3 {
 			gpio-controller;
 			#gpio-cells = <2>;
-
-			interrupt-controller;
-			#interrupt-cells = <2>;
 		};
 
-		gpm4: gpm4 {
+		gpy4: gpy4 {
 			gpio-controller;
 			#gpio-cells = <2>;
-
-			interrupt-controller;
-			#interrupt-cells = <2>;
 		};
 
-		gpy0: gpy0 {
+		gpy5: gpy5 {
 			gpio-controller;
 			#gpio-cells = <2>;
 		};
 
-		gpy1: gpy1 {
+		gpy6: gpy6 {
 			gpio-controller;
 			#gpio-cells = <2>;
 		};
 
-		gpy2: gpy2 {
+		gpm0: gpm0 {
 			gpio-controller;
 			#gpio-cells = <2>;
+
+			interrupt-controller;
+			#interrupt-cells = <2>;
 		};
 
-		gpy3: gpy3 {
+		gpm1: gpm1 {
 			gpio-controller;
 			#gpio-cells = <2>;
+
+			interrupt-controller;
+			#interrupt-cells = <2>;
 		};
 
-		gpy4: gpy4 {
+		gpm2: gpm2 {
 			gpio-controller;
 			#gpio-cells = <2>;
+
+			interrupt-controller;
+			#interrupt-cells = <2>;
 		};
 
-		gpy5: gpy5 {
+		gpm3: gpm3 {
 			gpio-controller;
 			#gpio-cells = <2>;
+
+			interrupt-controller;
+			#interrupt-cells = <2>;
 		};
 
-		gpy6: gpy6 {
+		gpm4: gpm4 {
 			gpio-controller;
 			#gpio-cells = <2>;
+
+			interrupt-controller;
+			#interrupt-cells = <2>;
 		};
 
 		gpx0: gpx0 {