From 02f08a0d21e558bb18f5ada89e7f690a7340fbb6 Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Mon, 3 Aug 2020 11:02:01 +0300 Subject: apalis-imx8qm: convert atmel mxt to syntactic sugar Convert an overlay file for Atmel MXT multitouch adapter for Apalis iMX8QM module into Syntactic Sugar format, as this format is strongly recommended in Embedded Linux Wiki [1]. [1] https://elinux.org/Device_Tree_Reference#Overlay_Source_Format Related-to: ELB-2834 Signed-off-by: Oleksandr Suvorov --- overlays/apalis-imx8qm_atmel-mxt_overlay.dts | 53 ++++++++++++++-------------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/overlays/apalis-imx8qm_atmel-mxt_overlay.dts b/overlays/apalis-imx8qm_atmel-mxt_overlay.dts index 0c60ad6..7a5679c 100644 --- a/overlays/apalis-imx8qm_atmel-mxt_overlay.dts +++ b/overlays/apalis-imx8qm_atmel-mxt_overlay.dts @@ -9,35 +9,34 @@ / { compatible = "toradex,apalis-imx8qm"; - fragment@0 { - target = <&i2c2>; - __overlay__ { - /* Atmel maxtouch controller */ - atmel_mxt_ts: atmel_mxt_ts@4a { - compatible = "atmel,maxtouch"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_touch>; - reg = <0x4a>; - interrupt-parent = <&gpio4>; - interrupts = <1 IRQ_TYPE_EDGE_FALLING>; /* Apalis GPIO5 */ - reset-gpios = <&gpio4 2 GPIO_ACTIVE_HIGH>; /* Apalis GPIO6 */ - status = "okay"; - }; - }; +}; + +&i2c2 { + #address-cells = <1>; + #size-cells = <0>; + + /* Atmel maxtouch controller */ + atmel_mxt_ts: atmel_mxt_ts@4a { + compatible = "atmel,maxtouch"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_touch>; + reg = <0x4a>; + interrupt-parent = <&gpio4>; + interrupts = <1 IRQ_TYPE_EDGE_FALLING>; /* Apalis GPIO5 */ + reset-gpios = <&gpio4 2 GPIO_ACTIVE_HIGH>; /* Apalis GPIO6 */ + status = "okay"; }; +}; - fragment@1 { - target = <&iomuxc>; - __overlay__ { - apalis-imx8qm { - /* Apalis GPIO5+6 */ - pinctrl_touch: touchgrp { - fsl,pins = < - SC_P_FLEXCAN2_RX_LSIO_GPIO4_IO01 0x06000021 - SC_P_FLEXCAN2_TX_LSIO_GPIO4_IO02 0x06000021 - >; - }; - }; +&iomuxc { + apalis-imx8qm { + /* Apalis GPIO5+6 */ + pinctrl_touch: touchgrp { + fsl,pins = < + SC_P_FLEXCAN2_RX_LSIO_GPIO4_IO01 0x06000021 + SC_P_FLEXCAN2_TX_LSIO_GPIO4_IO02 0x06000021 + >; }; }; }; + -- cgit v1.2.3