From 1266d0110fcedb08c996124ddb33bddd98ed61f5 Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Wed, 30 Dec 2020 19:40:11 +0200 Subject: ARM: dts: apalis-imx6: rearrange the fusion f0710a touchscreen As the Fusion touchscreen is not belong to the specific board but a part of peripheral, move it to the module level. Add the node name to use it in an overlay. Related-to: ELB-3398 Signed-off-by: Oleksandr Suvorov --- arch/arm/boot/dts/imx6q-apalis-eval.dts | 9 --------- arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts | 9 --------- arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts | 9 --------- arch/arm/boot/dts/imx6q-apalis-ixora.dts | 9 --------- arch/arm/boot/dts/imx6qdl-apalis.dtsi | 9 +++++++++ 5 files changed, 9 insertions(+), 36 deletions(-) diff --git a/arch/arm/boot/dts/imx6q-apalis-eval.dts b/arch/arm/boot/dts/imx6q-apalis-eval.dts index cc7ccd4833d4..5cd15186b8fd 100644 --- a/arch/arm/boot/dts/imx6q-apalis-eval.dts +++ b/arch/arm/boot/dts/imx6q-apalis-eval.dts @@ -125,15 +125,6 @@ &i2c1 { status = "okay"; - pcap@10 { - /* TouchRevolution Fusion 7 and 10 multi-touch controller */ - compatible = "touchrevolution,fusion-f0710a"; - reg = <0x10>; - gpios = <&gpio6 10 GPIO_ACTIVE_HIGH /* MXM3 11, Pen down interrupt */ - &gpio6 9 GPIO_ACTIVE_HIGH /* MXM3 13, Reset */ - >; - }; - pcie-switch@58 { compatible = "plx,pex8605"; reg = <0x58>; 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 af14f9b13d8d..fe7f1ac76db4 100644 --- a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts +++ b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts @@ -134,15 +134,6 @@ &i2c1 { status = "okay"; - pcap@10 { - /* TouchRevolution Fusion 7 and 10 multi-touch controller */ - compatible = "touchrevolution,fusion-f0710a"; - reg = <0x10>; - gpios = <&gpio6 10 GPIO_ACTIVE_HIGH /* MXM3 11, Pen down interrupt */ - &gpio6 9 GPIO_ACTIVE_HIGH /* MXM3 13, Reset */ - >; - }; - /* M41T0M6 real time clock on carrier board */ rtc_i2c: rtc@68 { compatible = "st,m41t0"; diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts index 80cc07ed429f..26c95bee5813 100644 --- a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts +++ b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts @@ -152,15 +152,6 @@ &i2c1 { status = "okay"; - pcap@10 { - /* TouchRevolution Fusion 7 and 10 multi-touch controller */ - compatible = "touchrevolution,fusion-f0710a"; - reg = <0x10>; - gpios = <&gpio6 10 GPIO_ACTIVE_HIGH /* MXM3 11, Pen down interrupt */ - &gpio6 9 GPIO_ACTIVE_HIGH /* MXM3 13, Reset */ - >; - }; - /* M41T0M6 real time clock on carrier board */ rtc_i2c: rtc@68 { compatible = "st,m41t0"; diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora.dts b/arch/arm/boot/dts/imx6q-apalis-ixora.dts index 1a0bade9a43d..25804dd9b175 100644 --- a/arch/arm/boot/dts/imx6q-apalis-ixora.dts +++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts @@ -125,15 +125,6 @@ &i2c1 { status = "okay"; - pcap@10 { - /* TouchRevolution Fusion 7 and 10 multi-touch controller */ - compatible = "touchrevolution,fusion-f0710a"; - reg = <0x10>; - gpios = <&gpio6 10 GPIO_ACTIVE_HIGH /* MXM3 11, Pen down interrupt */ - &gpio6 9 GPIO_ACTIVE_HIGH /* MXM3 13, Reset */ - >; - }; - eeprom@50 { compatible = "atmel,24c02"; reg = <0x50>; diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi index 84d08f01ab44..ac683d1145de 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi @@ -561,6 +561,15 @@ reset-gpios = <&gpio6 9 GPIO_ACTIVE_HIGH>; status = "disabled"; }; + + fusion_f0710a: pcap@10 { + /* TouchRevolution Fusion 7 and 10 multi-touch controller */ + compatible = "touchrevolution,fusion-f0710a"; + reg = <0x10>; + gpios = <&gpio6 10 GPIO_ACTIVE_HIGH /* MXM3 11, Pen down interrupt */ + &gpio6 9 GPIO_ACTIVE_HIGH /* MXM3 13, Reset */ + >; + }; }; /* -- cgit v1.2.3