3 files changed, 21 insertions, 9 deletions

diff --git a/arch/arm/boot/dts/exynos5.dtsi b/arch/arm/boot/dts/exynos5.dtsi
index 7da4a4285b24..347224589451 100644
--- a/arch/arm/boot/dts/exynos5.dtsi
+++ b/arch/arm/boot/dts/exynos5.dtsi
@@ -210,5 +210,12 @@
                         reg = <0x10830000 0x300>;
                         interrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>;
                 };
+
+                g2d: g2d@10850000 {
+                        compatible = "samsung,exynos5250-g2d";
+                        reg = <0x10850000 0x1000>;
+                        interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>;
+                        status = "disabled";
+                };
         };
 };
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index dbe81a1bfd25..f7ca2b689a46 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -245,15 +245,6 @@
                         samsung,syscon-phandle = <&pmu_system_controller>;
                 };
 
-                g2d@10850000 {
-                        compatible = "samsung,exynos5250-g2d";
-                        reg = <0x10850000 0x1000>;
-                        interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&clock CLK_G2D>;
-                        clock-names = "fimg2d";
-                        iommus = <&sysmmu_g2d>;
-                };
-
                 mfc: codec@11000000 {
                         compatible = "samsung,mfc-v6";
                         reg = <0x11000000 0x10000>;
@@ -1016,6 +1007,13 @@
         iommus = <&sysmmu_fimd1>;
 };
 
+&g2d {
+        iommus = <&sysmmu_g2d>;
+        clocks = <&clock CLK_G2D>;
+        clock-names = "fimg2d";
+        status = "okay";
+};
+
 &i2c_0 {
         clocks = <&clock CLK_I2C0>;
         clock-names = "i2c";
diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi
index 19d48798a80f..4c41316cfff7 100644
--- a/arch/arm/boot/dts/exynos5420.dtsi
+++ b/arch/arm/boot/dts/exynos5420.dtsi
@@ -1350,6 +1350,13 @@
         iommu-names = "m0", "m1";
 };
 
+&g2d {
+        iommus = <&sysmmu_g2dr>, <&sysmmu_g2dw>;
+        clocks = <&clock CLK_G2D>;
+        clock-names = "fimg2d";
+        status = "okay";
+};
+
 &i2c_0 {
         clocks = <&clock CLK_I2C0>;
         clock-names = "i2c";