diff options
| author | Sachin Kamat <sachin.kamat@linaro.org> | 2013-06-10 12:52:20 +0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2013-06-11 23:54:50 +0400 |
| commit | a8e0553d4e5533495d0a2214a3ce7ccbf570f16c (patch) | |
| tree | 1632ae42a784bf6e3952ca322163524b0c4a4f1f /arch/arm/boot/dts | |
| parent | 5cd644d837ae8c825066c225480647eb691e027d (diff) | |
| download | linux-a8e0553d4e5533495d0a2214a3ce7ccbf570f16c.tar.xz | |
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>
Diffstat (limited to 'arch/arm/boot/dts')
| -rw-r--r-- | arch/arm/boot/dts/exynos4412-origen.dts | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/exynos4412-smdk4412.dts | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/exynos4412-origen.dts b/arch/arm/boot/dts/exynos4412-origen.dts index 790a999f01ac..ca73c42f77e1 100644 --- 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 c52b01fa8260..a8ba195c41ac 100644 --- 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"; |