diff options
| author | Andreas Faerber <afaerber@suse.de> | 2014-07-29 18:51:56 -0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2014-07-29 18:53:07 -0400 |
| commit | 3428f20b65ec0d24be0adbc819e2bfb2eacb0bc2 (patch) | |
| tree | 4f70b25b9bfdf020887929fd89286a04b0d90bc5 | |
| parent | 10bc0450f09116d47e0374104868286de1066d6e (diff) | |
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>
| -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 @@ | |||
| 39 | status = "okay"; | 39 | status = "okay"; |
| 40 | samsung,i2c-sda-delay = <100>; | 40 | samsung,i2c-sda-delay = <100>; |
| 41 | samsung,i2c-max-bus-freq = <378000>; | 41 | samsung,i2c-max-bus-freq = <378000>; |
| 42 | |||
| 43 | trackpad { | ||
| 44 | reg = <0x67>; | ||
| 45 | compatible = "cypress,cyapa"; | ||
| 46 | interrupts = <2 0>; | ||
| 47 | interrupt-parent = <&gpx1>; | ||
| 48 | wakeup-source; | ||
| 49 | }; | ||
| 50 | }; | 42 | }; |
| 51 | 43 | ||
| 52 | i2c@12C80000 { | 44 | 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 @@ | |||
| 432 | }; | 432 | }; |
| 433 | }; | 433 | }; |
| 434 | }; | 434 | }; |
| 435 | |||
| 435 | &i2c_0 { | 436 | &i2c_0 { |
| 436 | max77686@09 { | 437 | max77686@09 { |
| 437 | compatible = "maxim,max77686"; | 438 | compatible = "maxim,max77686"; |
| @@ -578,6 +579,16 @@ | |||
| 578 | }; | 579 | }; |
| 579 | }; | 580 | }; |
| 580 | 581 | ||
| 582 | &i2c_1 { | ||
| 583 | trackpad { | ||
| 584 | reg = <0x67>; | ||
| 585 | compatible = "cypress,cyapa"; | ||
| 586 | interrupts = <2 0>; | ||
| 587 | interrupt-parent = <&gpx1>; | ||
| 588 | wakeup-source; | ||
| 589 | }; | ||
| 590 | }; | ||
| 591 | |||
| 581 | &pinctrl_0 { | 592 | &pinctrl_0 { |
| 582 | max77686_irq: max77686-irq { | 593 | max77686_irq: max77686-irq { |
| 583 | samsung,pins = "gpx3-2"; | 594 | samsung,pins = "gpx3-2"; |
