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 7da4a4285b240c0cb46146c497d1c20cbe3dea28..3472245894510c4954af8e791942892720352afa 100644 (file)
--- a/arch/arm/boot/dts/exynos5.dtsi
+++ b/arch/arm/boot/dts/exynos5.dtsi
@@ -210,5 +210,12 @@ sss: sss@10830000 {
                        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 dbe81a1bfd2598d27a4f1ee4da32f43d79a2b26c..f7ca2b689a46d17081dbac9ea1614d16f540eb4e 100644 (file)
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -245,15 +245,6 @@ watchdog@101D0000 {
                        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 @@ &fimd {
        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 19d48798a80f70bb42c09984c4c9f9ddf2e585e1..4c41316cfff70840193b7c49b737ec448b345dee 100644 (file)
--- a/arch/arm/boot/dts/exynos5420.dtsi
+++ b/arch/arm/boot/dts/exynos5420.dtsi
@@ -1350,6 +1350,13 @@ &fimd {
        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";