From 009f4c7f7dc5d977e015ea1f272ee0dad779fc1a Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Mon, 3 Aug 2020 11:26:10 +0300 Subject: apalis-imx8x: convert atmel mxt to syntactic sugar Convert an overlay file for Atmel MXT multitouch adapter for Apalis iMX8QXP 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-imx8x_atmel-mxt_overlay.dts | 53 ++++++++++++++--------------- 1 file changed, 26 insertions(+), 27 deletions(-) (limited to 'overlays') diff --git a/overlays/apalis-imx8x_atmel-mxt_overlay.dts b/overlays/apalis-imx8x_atmel-mxt_overlay.dts index 1cb649f..f14dfe8 100644 --- a/overlays/apalis-imx8x_atmel-mxt_overlay.dts +++ b/overlays/apalis-imx8x_atmel-mxt_overlay.dts @@ -9,35 +9,34 @@ / { compatible = "toradex,apalis-imx8qxp"; - fragment@0 { - target = <&i2c1>; - __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 = <&gpio3>; - interrupts = <17 IRQ_TYPE_EDGE_FALLING>; /* Apalis GPIO5 */ - reset-gpios = <&gpio3 18 GPIO_ACTIVE_HIGH>; /* Apalis GPIO6 */ - status = "okay"; - }; - }; +}; + +&i2c1 { + #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 = <&gpio3>; + interrupts = <17 IRQ_TYPE_EDGE_FALLING>; /* Apalis GPIO5 */ + reset-gpios = <&gpio3 18 GPIO_ACTIVE_HIGH>; /* Apalis GPIO6 */ + status = "okay"; }; +}; - fragment@1 { - target = <&iomuxc>; - __overlay__ { - apalis-imx8qxp { - /* Apalis GPIO5+6 */ - pinctrl_touch: touchgrp { - fsl,pins = < - SC_P_QSPI0B_SCLK_LSIO_GPIO3_IO17 0x21 /* MXM3 11 */ - SC_P_QSPI0B_DATA0_LSIO_GPIO3_IO18 0x21 /* MXM3 13 */ - >; - }; - }; +&iomuxc { + apalis-imx8qxp { + /* Apalis GPIO5+6 */ + pinctrl_touch: touchgrp { + fsl,pins = < + SC_P_QSPI0B_SCLK_LSIO_GPIO3_IO17 0x21 /* MXM3 11 */ + SC_P_QSPI0B_DATA0_LSIO_GPIO3_IO18 0x21 /* MXM3 13 */ + >; }; }; }; + -- cgit v1.2.3