| Message ID | 1366283719-9615-2-git-send-email-sachin.kamat@linaro.org |
|---|---|
| State | Accepted |
| Headers | show |
Sachin Kamat wrote: > > 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> > --- > arch/arm/boot/dts/exynos4412-origen.dts | 4 ++++ > 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 790a999..ca73c42 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 c52b01f..a8ba195 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"; > -- > 1.7.9.5 Ooops :( The 2 to 5 patches look good to me. Applied, btw, please make a cover 0/5 for series next time. Thanks. - Kukjin
diff --git a/arch/arm/boot/dts/exynos4412-origen.dts b/arch/arm/boot/dts/exynos4412-origen.dts index 790a999..ca73c42 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 c52b01f..a8ba195 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";
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> --- arch/arm/boot/dts/exynos4412-origen.dts | 4 ++++ arch/arm/boot/dts/exynos4412-smdk4412.dts | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-)