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

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
...@@ -98,6 +98,10 @@ key_enter { ...@@ -98,6 +98,10 @@ key_enter {
}; };
}; };
g2d@10800000 {
status = "okay";
};
sdhci@12530000 { sdhci@12530000 {
bus-width = <4>; bus-width = <4>;
pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_bus4 &sd2_cd>; pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_bus4 &sd2_cd>;
......
...@@ -31,10 +31,6 @@ g2d@10800000 { ...@@ -31,10 +31,6 @@ g2d@10800000 {
status = "okay"; status = "okay";
}; };
g2d@10800000 {
status = "okay";
};
pinctrl@11000000 { pinctrl@11000000 {
keypad_rows: keypad-rows { keypad_rows: keypad-rows {
samsung,pins = "gpx2-0", "gpx2-1", "gpx2-2"; samsung,pins = "gpx2-0", "gpx2-1", "gpx2-2";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment