Commit 24ffaa23 authored by Philippe Schenker's avatar Philippe Schenker Committed by Shawn Guo
Browse files

ARM: dts: imx6-apalis: Add touchscreens used on Toradex eval boards 



This commit adds the touchscreen from Toradex so one can enable it.
It is disabled by default because the pins are also used for PWM<B>,
PWM<C>, aka pwm2, pwm3 which is the standard use for colibri boards.

Signed-off-by: default avatarPhilippe Schenker <philippe.schenker@toradex.com>
Acked-by: default avatarMarcel Ziswiler <marcel.ziswiler@toradex.com>
Reviewed-by: default avatarOleksandr Suvorov <oleksandr.suvorov@toradex.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent e01f0fe3

arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts

+31 −0
Original line number Diff line number Diff line
@@ -168,6 +168,21 @@ 
&i2c3 {

	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";

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_pcap_1>;

		reg = <0x4a>;

		interrupt-parent = <&gpio1>;

		interrupts = <9 IRQ_TYPE_EDGE_FALLING>;		/* SODIMM 28 */

		reset-gpios = <&gpio2 10 GPIO_ACTIVE_HIGH>;	/* SODIMM 30 */

		status = "disabled";

	};



	/* M41T0M6 real time clock on carrier board */

	rtc_i2c: rtc@68 {

		compatible = "st,m41t0";
@@ -175,6 +190,22 @@ 
	};

};



&iomuxc {

	pinctrl_pcap_1: pcap1grp {

		fsl,pins = <

			MX6QDL_PAD_GPIO_9__GPIO1_IO09	0x1b0b0 /* SODIMM 28 */

			MX6QDL_PAD_SD4_DAT2__GPIO2_IO10	0x1b0b0 /* SODIMM 30 */

		>;

	};



	pinctrl_mxt_ts: mxttsgrp {

		fsl,pins = <

			MX6QDL_PAD_EIM_CS1__GPIO2_IO24	0x130b0 /* SODIMM 107 */

			MX6QDL_PAD_SD2_DAT1__GPIO1_IO14	0x130b0 /* SODIMM 106 */

		>;

	};

};



&ipu1_di0_disp0 {

	remote-endpoint = <&lcd_display_in>;

};

arch/arm/boot/dts/imx6q-apalis-eval.dts

+13 −0
Original line number Diff line number Diff line
@@ -167,6 +167,19 @@ 
&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_HIGH>; /* SODIMM 13 */

		status = "disabled";

	};



	pcie-switch@58 {

		compatible = "plx,pex8605";

		reg = <0x58>;

arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts

+13 −0
Original line number Diff line number Diff line
@@ -172,6 +172,19 @@ 
&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_HIGH>; /* SODIMM 13 */

		status = "disabled";

	};



	/* M41T0M6 real time clock on carrier board */

	rtc_i2c: rtc@68 {

		compatible = "st,m41t0";

arch/arm/boot/dts/imx6q-apalis-ixora.dts

+13 −0
Original line number Diff line number Diff line
@@ -171,6 +171,19 @@ 
&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_HIGH>; /* SODIMM 13 */

		status = "disabled";

	};



	eeprom@50 {

		compatible = "atmel,24c02";

		reg = <0x50>;