ARM: dts: Remove duplicate and add missing G2D nodes

G2D node got added twice in exynos4412-smdk4412.dts instead of
getting added to exynos4412-origen.dts. Remove the duplicate entry
and add it to exynos4412-origen.dts.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

diff --git a/arch/arm/boot/dts/exynos4412-origen.dts b/arch/arm/boot/dts/exynos4412-origen.dts
index 790a999f01acc650f9ceddd26ea0ad2bd0d001fa..ca73c42f77e1ae25742a4baef1172705533d3662 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-origen.dts
+++ b/arch/arm/boot/dts/exynos4412-origen.dts
@@ -98,6 +98,10 @@
                };
        };
 
+       g2d@10800000 {
+               status = "okay";
+       };
+
        sdhci@12530000 {
                bus-width = <4>;
                pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_bus4 &sd2_cd>;

diff --git a/arch/arm/boot/dts/exynos4412-smdk4412.dts b/arch/arm/boot/dts/exynos4412-smdk4412.dts
index c52b01fa826000709c8328c1cd7c43bb99bdbb09..a8ba195c41ac5896bcceefebb9ac2b3b0eab6f78 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-smdk4412.dts
+++ b/arch/arm/boot/dts/exynos4412-smdk4412.dts
@@ -31,10 +31,6 @@
                status = "okay";
        };
 
-       g2d@10800000 {
-               status = "okay";
-       };
-
        pinctrl@11000000 {
                keypad_rows: keypad-rows {
                        samsung,pins = "gpx2-0", "gpx2-1", "gpx2-2";