diff options
author | Haibo Chen <haibo.chen@freescale.com> | 2015-04-03 13:51:08 +0800 |
---|---|---|
committer | guoyin.chen <guoyin.chen@freescale.com> | 2015-05-08 17:26:23 +0800 |
commit | b73dd681d9bab02977ad42072670211928b7d8a8 (patch) | |
tree | 4c6af274058f83faade38d0a47750e3f60cf7e1d | |
parent | c00d5d54175e902c10708b07558ede02ae544234 (diff) |
MLK-10543-1 ARM: dts: imx7d-12x12-arm2: add tsc2007 touch support
add tsc2007 touch support for i.mx7d-12x12-arm2 board.
tsc2007 is a i2c slave, and it use A0 and A1 to choose a different
i2c slave address. Now tsc2007's slave address is 0x48 on the
i.MX7D-12x12-arm2 board in default. This slave address is conflict
with the PMIC(max17135) on the EPDC board.
If we want to both enable tsc2007 and max17135, we can do a hardware
rework, add R168 or R172 will fix this issue.
Signed-off-by: Haibo Chen <haibo.chen@freescale.com>
(cherry picked from commit 6a83f6484115f6fbaf5fa334835803db11fb5008)
Conflicts:
arch/arm/boot/dts/imx7d-12x12-arm2.dts
-rw-r--r-- | arch/arm/boot/dts/imx7d-12x12-arm2.dts | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx7d-12x12-arm2.dts b/arch/arm/boot/dts/imx7d-12x12-arm2.dts index 801db1a717cb..291fc411281c 100644 --- a/arch/arm/boot/dts/imx7d-12x12-arm2.dts +++ b/arch/arm/boot/dts/imx7d-12x12-arm2.dts @@ -588,6 +588,14 @@ }; }; + touch { + pinctrl_tsc2007: tsc2007grp { + fsl,pins = < + MX7D_PAD_GPIO1_IO08__GPIO1_IO8 0x80000000 + >; + }; + }; + uart1 { pinctrl_uart1_1: uart1grp-1 { fsl,pins = < @@ -863,6 +871,17 @@ pinctrl-0 = <&pinctrl_i2c3_1>; status = "okay"; + tsc2007@48 { + compatible = "ti,tsc2007"; + reg = <0x48>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_tsc2007>; + interrupt-parent = <&gpio1>; + interrupts = <8 0>; + pendown-gpio = <&gpio1 8 1>; + ti,x-plate-ohms = <660>; + }; + max7322: gpio@68 { compatible = "maxim,max7322"; reg = <0x68>; |