diff options
author | Max Krummenacher <max.krummenacher@toradex.com> | 2022-06-15 13:49:55 +0200 |
---|---|---|
committer | Shawn Guo <shawnguo@kernel.org> | 2022-06-20 03:12:19 +0200 |
commit | 2c119c4d9cdf208f94aaa8e1b4af7981d9a4b532 (patch) | |
tree | fa9585c1ba1d4fe98239096d84232798796fcf60 /arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts | |
parent | ARM: dts: imx6q-apalis: Move pinmux groups to SoM dtsi (diff) | |
download | linux-2c119c4d9cdf208f94aaa8e1b4af7981d9a4b532.tar.xz linux-2c119c4d9cdf208f94aaa8e1b4af7981d9a4b532.zip |
ARM: dts: imx6q-apalis: Move Atmel MXT touch ctrl to SoM dtsi
Reduces code duplication. While at it drop the comments which do not
apply on Apalis iMX6 but add the correct SoM pin names.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Diffstat (limited to 'arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts')
-rw-r--r-- | arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts index 8febfc0aea93..21f88e19e87d 100644 --- a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts +++ b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts @@ -89,19 +89,6 @@ &i2c1 { status = "okay"; - /* - * Touchscreen is using SODIMM 28/30, also used for PWM<B>, PWM<C>, - * aka pwm2, pwm3. so if you enable touchscreen, disable the pwms - */ - touchscreen@4a { - compatible = "atmel,maxtouch"; - reg = <0x4a>; - interrupt-parent = <&gpio6>; - interrupts = <10 IRQ_TYPE_EDGE_FALLING>; - reset-gpios = <&gpio6 9 GPIO_ACTIVE_LOW>; /* SODIMM 13 */ - status = "disabled"; - }; - /* M41T0M6 real time clock on carrier board */ rtc_i2c: rtc@68 { compatible = "st,m41t0"; |