diff options
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl-apalis-eval.dtsi | 15 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl-apalis-ixora-v1.1.dtsi | 15 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl-apalis-ixora.dtsi | 15 |
3 files changed, 39 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/imx6qdl-apalis-eval.dtsi b/arch/arm/boot/dts/imx6qdl-apalis-eval.dtsi index 72033acfdd5d..7b79d4a368da 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis-eval.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis-eval.dtsi @@ -164,6 +164,15 @@ &i2c1 { status = "okay"; + /* Atmel maxtouch controller */ + atmel_mxt_ts: atmel_mxt_ts@4a { + compatible = "atmel,maxtouch"; + reg = <0x4a>; + interrupt-parent = <&gpio6>; + interrupts = <10 IRQ_TYPE_EDGE_FALLING>; + status = "disabled"; + }; + pcap@10 { /* TouchRevolution Fusion 7 and 10 multi-touch controller */ compatible = "touchrevolution,fusion-f0710a"; @@ -277,8 +286,10 @@ &iomuxc { /* - * Mux the Apalis GPIOs, GPIO7 used for PCIe reset, - * GPIO5, 6 used by optional fusion_F0710A kernel module + * Mux the Apalis GPIOs. + * Note: + * - GPIO7 is used for PCIe reset + * - GPIO5, 6 are used by optional capacitive touch controller */ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_apalis_gpio1 &pinctrl_apalis_gpio2 diff --git a/arch/arm/boot/dts/imx6qdl-apalis-ixora-v1.1.dtsi b/arch/arm/boot/dts/imx6qdl-apalis-ixora-v1.1.dtsi index 3fec9fd9c30a..354bf80d9394 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis-ixora-v1.1.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis-ixora-v1.1.dtsi @@ -160,6 +160,15 @@ &i2c1 { status = "okay"; + /* Atmel maxtouch controller */ + atmel_mxt_ts: atmel_mxt_ts@4a { + compatible = "atmel,maxtouch"; + reg = <0x4a>; + interrupt-parent = <&gpio6>; + interrupts = <10 IRQ_TYPE_EDGE_FALLING>; + status = "disabled"; + }; + pcap@10 { /* TouchRevolution Fusion 7 and 10 multi-touch controller */ compatible = "touchrevolution,fusion-f0710a"; @@ -266,8 +275,10 @@ &iomuxc { /* - * Mux the Apalis GPIOs, GPIO7 used for PCIe reset, - * GPIO5, 6 used by optional fusion_F0710A kernel module + * Mux the Apalis GPIOs. + * Note: + * - GPIO7 is used for PCIe reset + * - GPIO5, 6 are used by optional capacitive touch controller */ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_apalis_gpio1 &pinctrl_apalis_gpio2 diff --git a/arch/arm/boot/dts/imx6qdl-apalis-ixora.dtsi b/arch/arm/boot/dts/imx6qdl-apalis-ixora.dtsi index e89657267d01..aa42308df6e3 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis-ixora.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis-ixora.dtsi @@ -155,6 +155,15 @@ &i2c1 { status = "okay"; + /* Atmel maxtouch controller */ + atmel_mxt_ts: atmel_mxt_ts@4a { + compatible = "atmel,maxtouch"; + reg = <0x4a>; + interrupt-parent = <&gpio6>; + interrupts = <10 IRQ_TYPE_EDGE_FALLING>; + status = "disabled"; + }; + pcap@10 { /* TouchRevolution Fusion 7 and 10 multi-touch controller */ compatible = "touchrevolution,fusion-f0710a"; @@ -250,8 +259,10 @@ &iomuxc { /* - * Mux the Apalis GPIOs, GPIO7 used for PCIe reset, - * GPIO5, 6 used by optional fusion_F0710A kernel module + * Mux the Apalis GPIOs. + * Note: + * - GPIO7 is used for PCIe reset + * - GPIO5, 6 are used by optional capacitive touch controller */ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_apalis_gpio1 &pinctrl_apalis_gpio2 |