From e745022d83ecd5fe33bb13cbf5d804ba46d24990 Mon Sep 17 00:00:00 2001 From: Philippe Schenker Date: Mon, 24 Aug 2020 16:37:36 +0200 Subject: Revert "colibri-imx7: aster: convert atmel mxt to syntactic sugar" This reverts commit fa0dd9dde736e588d7249ed0f945ab4b2c49a6ec. Syntactic sugar is not fully supported on 4.14 kernel revert all overlays for this branch Signed-off-by: Philippe Schenker --- overlays/colibri-imx7-aster_atmel-mxt_overlay.dts | 47 ++++++++++++----------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/overlays/colibri-imx7-aster_atmel-mxt_overlay.dts b/overlays/colibri-imx7-aster_atmel-mxt_overlay.dts index 0c1ffbf..0fef20c 100644 --- a/overlays/colibri-imx7-aster_atmel-mxt_overlay.dts +++ b/overlays/colibri-imx7-aster_atmel-mxt_overlay.dts @@ -2,32 +2,33 @@ /dts-v1/; /plugin/; - -#include -#include - / { compatible = "toradex,colibri-imx7d-emmc"; -}; - -&i2c4 { - #address-cells = <1>; - #size-cells = <0>; - - atmel_mxt_ts: atmel_mxt_ts@4a { - compatible = "atmel,maxtouch"; - reg = <0x4a>; - interrupt-parent = <&gpio2>; - interrupts = <15 IRQ_TYPE_EDGE_FALLING>; - reset-gpios = <&gpio2 28 GPIO_ACTIVE_HIGH>; - status = "okay"; + fragment@0 { + target = <&i2c4>; + __overlay__ { + atmel_mxt_ts: atmel_mxt_ts@4a { + compatible = "atmel,maxtouch"; + reg = <0x4a>; + interrupt-parent = <&gpio2>; + interrupts = <15 2>; + reset-gpios = <&gpio2 28 0>; + status = "okay"; + }; + }; }; -}; -&pwm2 { - status = "disabled"; -}; + fragment@1 { + target = <&pwm2>; + __overlay__ { + status = "disabled"; + }; + }; -&pwm3 { - status = "disabled"; + fragment@2 { + target = <&pwm3>; + __overlay__ { + status = "disabled"; + }; + }; }; -- cgit v1.2.3