diff options
| author | Haibo Chen <haibo.chen@freescale.com> | 2015-12-24 16:36:51 +0800 |
|---|---|---|
| committer | Jason Liu <jason.hui.liu@nxp.com> | 2019-02-12 10:24:04 +0800 |
| commit | 1f9d9b6e389a11b2878aca35341fd0aaa2de385f (patch) | |
| tree | e7ce76f18efd0898c0d2bd71be2c30d55e6302a7 /arch/arm/boot | |
| parent | 85c7d82ea3bc50b350b0a164ec85adf373fcb890 (diff) | |
MLK-12075 ARM: dts: add imx7d-sdb-reva-touch.dtb
For imx7d-sdb TO1.1 board, the touch interrupt pin no longer conflict
with HDMI, so move touch support is now inside imx7d-sdb.dts. To
compatible with TO1.0 board, still use imx7d-sdb-reva-touch.dts to
support touch.
Signed-off-by: Haibo Chen <haibo.chen@freescale.com>
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx7d-sdb-reva-touch.dts | 14 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx7d-sdb-reva.dts | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx7d-sdb.dts | 10 |
4 files changed, 26 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 8bf04a68a65b..47529eaa9c1c 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -555,6 +555,7 @@ dtb-$(CONFIG_SOC_IMX7D) += \ imx7d-sdb-reva-hdmi-audio.dtb \ imx7d-sdb-reva-m4.dtb \ imx7d-sdb-reva-qspi.dtb \ + imx7d-sdb-reva-touch.dtb \ imx7d-sdb-reva-wm8960.dtb \ imx7s-colibri-eval-v3.dtb \ imx7s-warp.dtb \ diff --git a/arch/arm/boot/dts/imx7d-sdb-reva-touch.dts b/arch/arm/boot/dts/imx7d-sdb-reva-touch.dts index 7c338d536cf5..d3855e8d7978 100644 --- a/arch/arm/boot/dts/imx7d-sdb-reva-touch.dts +++ b/arch/arm/boot/dts/imx7d-sdb-reva-touch.dts @@ -6,4 +6,16 @@ * published by the Free Software Foundation. */ #include "imx7d-sdb-reva.dts" -#include "imx7d-sdb-touch.dtsi" + +&sii902x { + status = "disabled"; +}; + +&ecspi3 { + status = "okay"; + + tsc2046 { + interrupts = <13 0>; + pendown-gpio = <&gpio2 13 0>; + }; +}; diff --git a/arch/arm/boot/dts/imx7d-sdb-reva.dts b/arch/arm/boot/dts/imx7d-sdb-reva.dts index 6c47137c3927..73e0b0b66e01 100644 --- a/arch/arm/boot/dts/imx7d-sdb-reva.dts +++ b/arch/arm/boot/dts/imx7d-sdb-reva.dts @@ -28,6 +28,10 @@ }; }; +&ecspi3 { + status = "disabled"; +}; + &epdc { pinctrl-0 = <&pinctrl_epdc0>; en-gpios = <&extended_io 5 GPIO_ACTIVE_LOW>; diff --git a/arch/arm/boot/dts/imx7d-sdb.dts b/arch/arm/boot/dts/imx7d-sdb.dts index d04329f3147c..aa4bdd35f4eb 100644 --- a/arch/arm/boot/dts/imx7d-sdb.dts +++ b/arch/arm/boot/dts/imx7d-sdb.dts @@ -236,8 +236,9 @@ }; &ecspi3 { + fsl,spi-num-chipselects = <1>; pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_ecspi3>; + pinctrl-0 = <&pinctrl_ecspi3 &pinctrl_ecspi3_cs>; cs-gpios = <&gpio5 9 GPIO_ACTIVE_HIGH>; status = "okay"; @@ -792,7 +793,12 @@ MX7D_PAD_SAI2_TX_SYNC__ECSPI3_MISO 0x2 MX7D_PAD_SAI2_TX_BCLK__ECSPI3_MOSI 0x2 MX7D_PAD_SAI2_RX_DATA__ECSPI3_SCLK 0x2 - MX7D_PAD_SD2_CD_B__GPIO5_IO9 0x59 + >; + }; + + pinctrl_ecspi3_cs: ecspi3_cs_grp { + fsl,pins = < + MX7D_PAD_SD2_CD_B__GPIO5_IO9 0x80000000 >; }; |