devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Andreas Färber" <afaerber@suse.de>
To: linux-samsung-soc@vger.kernel.org
Cc: "Stephan van Schaik" <stephan@synkhronix.com>,
	"Vincent Palatin" <vpalatin@chromium.org>,
	"Doug Anderson" <dianders@chromium.org>,
	"Andreas Färber" <afaerber@suse.de>,
	"Ben Dooks" <ben-linux@fluff.org>,
	"Kukjin Kim" <kgene.kim@samsung.com>,
	"Rob Herring" <robh+dt@kernel.org>,
	"Pawel Moll" <pawel.moll@arm.com>,
	"Mark Rutland" <mark.rutland@arm.com>,
	"Ian Campbell" <ijc+devicetree@hellion.org.uk>,
	"Kumar Gala" <galak@codeaurora.org>,
	"Russell King" <linux@arm.linux.org.uk>,
	"moderated list:ARM/SAMSUNG ARM A..."
	<linux-arm-kernel@lists.infradead.org>,
	"open list:OPEN FIRMWARE AND..." <devicetree@vger.kernel.org>,
	"open list" <linux-kernel@vger.kernel.org>
Subject: [PATCH v2 2/4] ARM: dts: exynos5250: cypress,cyapa trackpad is Snow only
Date: Fri, 18 Jul 2014 19:20:07 +0200	[thread overview]
Message-ID: <1405704009-8430-3-git-send-email-afaerber@suse.de> (raw)
In-Reply-To: <1405704009-8430-1-git-send-email-afaerber@suse.de>

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(-)

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";
-- 
1.9.3

  parent reply	other threads:[~2014-07-18 17:20 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <1405704009-8430-1-git-send-email-afaerber@suse.de>
2014-07-18 17:20 ` [PATCH v2 1/4] ARM: dts: exynos5250: max77686 is Snow only Andreas Färber
2014-07-25  5:28   ` Kukjin Kim
2014-07-25 15:08     ` Doug Anderson
2014-07-25 15:13       ` Doug Anderson
2014-07-25 15:30         ` Andreas Färber
2014-07-25 16:02           ` Doug Anderson
2014-07-29 16:15   ` Doug Anderson
2014-07-18 17:20 ` Andreas Färber [this message]
2014-07-29 16:16   ` [PATCH v2 2/4] ARM: dts: exynos5250: cypress,cyapa trackpad " Doug Anderson
2014-07-29 23:06     ` Kukjin Kim
2014-07-30  0:21       ` Andreas Färber
2014-07-18 17:20 ` [PATCH v2 3/4] ARM: dts: exynos5250: Fold common ChromeOS parts into Snow Andreas Färber
2014-07-25 16:02   ` Doug Anderson
2014-07-29 12:45     ` Andreas Färber
2014-07-29 15:11       ` Doug Anderson
2014-07-25 16:35   ` Javier Martinez Canillas
2014-07-25 16:43     ` Doug Anderson
2014-07-25 17:02       ` Javier Martinez Canillas
2014-07-29 13:00         ` Andreas Färber
2014-07-29 14:39           ` Javier Martinez Canillas
2014-07-29 15:27           ` Doug Anderson
2014-07-18 17:20 ` [PATCH v2 4/4] ARM: dts: exynos5250: Add Spring device tree Andreas Färber
2014-07-25 16:02   ` Doug Anderson
     [not found]     ` <CAD=FV=Xu9b6433pV=bqi3jZZR03G6nyi2iNgbSXwAcRY4Y=4yA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-07-30 13:06       ` Andreas Färber

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1405704009-8430-3-git-send-email-afaerber@suse.de \
    --to=afaerber@suse.de \
    --cc=ben-linux@fluff.org \
    --cc=devicetree@vger.kernel.org \
    --cc=dianders@chromium.org \
    --cc=galak@codeaurora.org \
    --cc=ijc+devicetree@hellion.org.uk \
    --cc=kgene.kim@samsung.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-samsung-soc@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    --cc=mark.rutland@arm.com \
    --cc=pawel.moll@arm.com \
    --cc=robh+dt@kernel.org \
    --cc=stephan@synkhronix.com \
    --cc=vpalatin@chromium.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).