Commit 2c119c4d authored by Max Krummenacher's avatar Max Krummenacher Committed by Shawn Guo
Browse files

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: default avatarMax Krummenacher <max.krummenacher@toradex.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 1c5fa828

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

+0 −13
Original line number Diff line number Diff line
@@ -82,19 +82,6 @@ &hdmi { 
&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";

	};



	pcie-switch@58 {

		compatible = "plx,pex8605";

		reg = <0x58>;

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

+0 −13
Original line number Diff line number Diff line
@@ -89,19 +89,6 @@ &hdmi { 
&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";

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

+0 −13
Original line number Diff line number Diff line
@@ -88,19 +88,6 @@ &hdmi { 
&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";

	};



	eeprom@50 {

		compatible = "atmel,24c02";

		reg = <0x50>;

arch/arm/boot/dts/imx6qdl-apalis.dtsi

+11 −0
Original line number Diff line number Diff line
@@ -416,6 +416,17 @@ &i2c1 { 
	scl-gpios = <&gpio5 27 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;

	sda-gpios = <&gpio5 26 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;

	status = "disabled";



	atmel_mxt_ts: touchscreen@4a {

		compatible = "atmel,maxtouch";

		/* These GPIOs are muxed with the iomuxc node */

		interrupt-parent = <&gpio6>;

		interrupts = <10 IRQ_TYPE_EDGE_FALLING>;	/* MXM3_11 */

		reg = <0x4a>;

		reset-gpios = <&gpio6 9 GPIO_ACTIVE_LOW>;	/* MXM3_13 */

		status = "disabled";

	};



};



/*