| Message ID | 1405704009-8430-3-git-send-email-afaerber@suse.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Andreas, On Fri, Jul 18, 2014 at 10:20 AM, Andreas Färber <afaerber@suse.de> wrote: > Move it from exynos5250-cros-common.dtsi to exynos5250-snow.dts. > Spring does not need it, it uses an Atmel maXTouch instead. > > Signed-off-by: Andreas Färber <afaerber@suse.de> > --- > v2: New (Doug Anderson) > > arch/arm/boot/dts/exynos5250-cros-common.dtsi | 8 -------- > arch/arm/boot/dts/exynos5250-snow.dts | 10 ++++++++++ > 2 files changed, 10 insertions(+), 8 deletions(-) Reviewed-by: Doug Anderson <dianders@chromium.org> Kukjin could apply this now if he wanted to avoid future conflicts.
On 07/30/14 01:16, Doug Anderson wrote: > Andreas, > > On Fri, Jul 18, 2014 at 10:20 AM, Andreas Färber<afaerber@suse.de> wrote: >> Move it from exynos5250-cros-common.dtsi to exynos5250-snow.dts. >> Spring does not need it, it uses an Atmel maXTouch instead. >> >> Signed-off-by: Andreas Färber<afaerber@suse.de> >> --- >> v2: New (Doug Anderson) >> >> arch/arm/boot/dts/exynos5250-cros-common.dtsi | 8 -------- >> arch/arm/boot/dts/exynos5250-snow.dts | 10 ++++++++++ >> 2 files changed, 10 insertions(+), 8 deletions(-) > > Reviewed-by: Doug Anderson<dianders@chromium.org> > > Kukjin could apply this now if he wanted to avoid future conflicts. OK, I read your comments on another this series and I've applied 1/4 and 2/4 as per your suggestion with your reviewed by tag ;) And I think, Andreas is going to re-spin remains for exynos5250-spring based on updated my -next? Thanks, Kukjin
Am 30.07.2014 01:06, schrieb Kukjin Kim: > On 07/30/14 01:16, Doug Anderson wrote: >> On Fri, Jul 18, 2014 at 10:20 AM, Andreas Färber<afaerber@suse.de> >> wrote: >>> Move it from exynos5250-cros-common.dtsi to exynos5250-snow.dts. >>> Spring does not need it, it uses an Atmel maXTouch instead. >>> >>> Signed-off-by: Andreas Färber<afaerber@suse.de> >>> --- >>> v2: New (Doug Anderson) >>> >>> arch/arm/boot/dts/exynos5250-cros-common.dtsi | 8 -------- >>> arch/arm/boot/dts/exynos5250-snow.dts | 10 ++++++++++ >>> 2 files changed, 10 insertions(+), 8 deletions(-) >> >> Reviewed-by: Doug Anderson<dianders@chromium.org> >> >> Kukjin could apply this now if he wanted to avoid future conflicts. > > OK, I read your comments on another this series and I've applied 1/4 and > 2/4 as per your suggestion with your reviewed by tag ;) Thanks. > And I think, Andreas is going to re-spin remains for exynos5250-spring > based on updated my -next? Yes. Please don't apply 3/4, I'm fixing a duplicate hdmi node. Regards, Andreas
diff --git a/arch/arm/boot/dts/exynos5250-cros-common.dtsi b/arch/arm/boot/dts/exynos5250-cros-common.dtsi index 61128d1..e603e9c 100644 --- a/arch/arm/boot/dts/exynos5250-cros-common.dtsi +++ b/arch/arm/boot/dts/exynos5250-cros-common.dtsi @@ -39,14 +39,6 @@ status = "okay"; samsung,i2c-sda-delay = <100>; samsung,i2c-max-bus-freq = <378000>; - - trackpad { - reg = <0x67>; - compatible = "cypress,cyapa"; - interrupts = <2 0>; - interrupt-parent = <&gpx1>; - wakeup-source; - }; }; i2c@12C80000 { diff --git a/arch/arm/boot/dts/exynos5250-snow.dts b/arch/arm/boot/dts/exynos5250-snow.dts index 0f867a3..f2b8c41 100644 --- a/arch/arm/boot/dts/exynos5250-snow.dts +++ b/arch/arm/boot/dts/exynos5250-snow.dts @@ -490,6 +490,16 @@ }; }; +&i2c_1 { + trackpad { + reg = <0x67>; + compatible = "cypress,cyapa"; + interrupts = <2 0>; + interrupt-parent = <&gpx1>; + wakeup-source; + }; +}; + &pinctrl_0 { max77686_irq: max77686-irq { samsung,pins = "gpx3-2";
Move it from exynos5250-cros-common.dtsi to exynos5250-snow.dts. Spring does not need it, it uses an Atmel maXTouch instead. Signed-off-by: Andreas Färber <afaerber@suse.de> --- v2: New (Doug Anderson) arch/arm/boot/dts/exynos5250-cros-common.dtsi | 8 -------- arch/arm/boot/dts/exynos5250-snow.dts | 10 ++++++++++ 2 files changed, 10 insertions(+), 8 deletions(-)