From: Andreas Faerber Date: Tue, 29 Jul 2014 22:51:56 +0000 (+0900) Subject: ARM: dts: cypress,cyapa trackpad is exynos5250-Snow only X-Git-Tag: v3.17-rc1~77^2^2~4 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3428f20b65ec0d24be0adbc819e2bfb2eacb0bc2;p=karo-tx-linux.git 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 Reviewed-by: Doug Anderson Signed-off-by: Kukjin Kim --- 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";