ARM: dts: exynos: Move G2D node to exynos5.dtsi

Current the node is only defined in the exynos5250 DT, while
the corresponding SYSMMUs are also to be found in the exynos5420
DT. Move the node to exynos5 and only setup the SYSMMUs in the
corresponding DT.

Disable the node by default, since exynos5410 also includes
the dtsi, but currently does not define the G2D clock.

Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Tobias Jakobi <tjakobi@math.uni-bielefeld.de>
[mszyprow: rephrased commit message]
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>

diff --git a/arch/arm/boot/dts/exynos5.dtsi b/arch/arm/boot/dts/exynos5.dtsi
index 7da4a42..3472245 100644 (file)
--- 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 d7906b3..5e3f1b2 100644 (file)
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -313,15 +313,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>;
@@ -1084,6 +1075,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 19d4879..4c41316 100644 (file)
--- 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";