diff options
| author | Andreas Faerber <afaerber@suse.de> | 2014-07-30 07:51:56 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2014-07-30 07:53:07 +0900 |
| commit | 3428f20b65ec0d24be0adbc819e2bfb2eacb0bc2 (patch) | |
| tree | 4f70b25b9bfdf020887929fd89286a04b0d90bc5 /arch/arm/boot | |
| parent | 10bc0450f09116d47e0374104868286de1066d6e (diff) | |
| download | blackbird-op-linux-3428f20b65ec0d24be0adbc819e2bfb2eacb0bc2.tar.gz blackbird-op-linux-3428f20b65ec0d24be0adbc819e2bfb2eacb0bc2.zip | |
ARM: dts: cypress,cyapa trackpad is exynos5250-Snow only
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 Faerber <afaerber@suse.de>
Reviewed-by: Doug Anderson <dianders@chromium.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/exynos5250-cros-common.dtsi | 8 | ||||
| -rw-r--r-- | arch/arm/boot/dts/exynos5250-snow.dts | 11 |
2 files changed, 11 insertions, 8 deletions
diff --git a/arch/arm/boot/dts/exynos5250-cros-common.dtsi b/arch/arm/boot/dts/exynos5250-cros-common.dtsi index 61128d10b83c..e603e9c70142 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 36212974ffed..7c4bdaaf4879 100644 --- a/arch/arm/boot/dts/exynos5250-snow.dts +++ b/arch/arm/boot/dts/exynos5250-snow.dts @@ -432,6 +432,7 @@ }; }; }; + &i2c_0 { max77686@09 { compatible = "maxim,max77686"; @@ -578,6 +579,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"; |
