From e00b36e3ee80fed3918d192bfecca744b92d405d Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Sun, 2 Aug 2020 00:38:29 +0300 Subject: colibri-imx8x: convert ad7879 to syntactic sugar Convert an overlay file for analogue touch controller AD7879 for Colibri 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/colibri-imx8x_ad7879_overlay.dts | 61 +++++++++++++++---------------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/overlays/colibri-imx8x_ad7879_overlay.dts b/overlays/colibri-imx8x_ad7879_overlay.dts index 5587032..dadbdba 100644 --- a/overlays/colibri-imx8x_ad7879_overlay.dts +++ b/overlays/colibri-imx8x_ad7879_overlay.dts @@ -9,39 +9,38 @@ / { compatible = "toradex,colibri-imx8qxp"; - fragment@0 { - target = <&i2c0>; - __overlay__ { - /* Touch controller */ - ad7879@2c { - compatible = "adi,ad7879-1"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_ad7879_int>; - reg = <0x2c>; - interrupt-parent = <&gpio3>; - interrupts = <5 IRQ_TYPE_EDGE_FALLING>; - touchscreen-max-pressure = <4096>; - adi,resistance-plate-x = <120>; - adi,first-conversion-delay = /bits/ 8 <3>; - adi,acquisition-time = /bits/ 8 <1>; - adi,median-filter-size = /bits/ 8 <2>; - adi,averaging = /bits/ 8 <1>; - adi,conversion-interval = /bits/ 8 <255>; - }; - }; +}; + +&i2c0 { + #address-cells = <1>; + #size-cells = <0>; + + /* Touch controller */ + ad7879@2c { + compatible = "adi,ad7879-1"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ad7879_int>; + reg = <0x2c>; + interrupt-parent = <&gpio3>; + interrupts = <5 IRQ_TYPE_EDGE_FALLING>; + touchscreen-max-pressure = <4096>; + adi,resistance-plate-x = <120>; + adi,first-conversion-delay = /bits/ 8 <3>; + adi,acquisition-time = /bits/ 8 <1>; + adi,median-filter-size = /bits/ 8 <2>; + adi,averaging = /bits/ 8 <1>; + adi,conversion-interval = /bits/ 8 <255>; }; +}; - fragment@1 { - target = <&iomuxc>; - __overlay__ { - colibri-imx8qxp { - /* On-module touch pen-down interrupt */ - pinctrl_ad7879_int: ad7879-int { - fsl,pins = < - SC_P_MIPI_CSI0_I2C0_SCL_LSIO_GPIO3_IO05 0x21 - >; - }; - }; +&iomuxc { + colibri-imx8qxp { + /* On-module touch pen-down interrupt */ + pinctrl_ad7879_int: ad7879-int { + fsl,pins = < + SC_P_MIPI_CSI0_I2C0_SCL_LSIO_GPIO3_IO05 0x21 + >; }; }; }; + -- cgit v1.2.3