Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8e0553d authored by Sachin Kamat's avatar Sachin Kamat Committed by Kukjin Kim
Browse files

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: default avatarSachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 5cd644d8

arch/arm/boot/dts/exynos4412-origen.dts

+4 −0
Original line number Diff line number Diff line
@@ -98,6 +98,10 @@ 
		};

	};



	g2d@10800000 {

		status = "okay";

	};



	sdhci@12530000 {

		bus-width = <4>;

		pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_bus4 &sd2_cd>;

arch/arm/boot/dts/exynos4412-smdk4412.dts

+0 −4
Original line number Diff line number Diff line
@@ -31,10 +31,6 @@ 
		status = "okay";

	};



	g2d@10800000 {

		status = "okay";

	};



	pinctrl@11000000 {

		keypad_rows: keypad-rows {

			samsung,pins = "gpx2-0", "gpx2-1", "gpx2-2";