summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Schenker <philippe.schenker@toradex.com>2020-08-24 16:37:40 +0200
committerPhilippe Schenker <philippe.schenker@toradex.com>2020-08-24 16:37:40 +0200
commitc6ad351eaaefcb02f39a9294b611c84e23c815e9 (patch)
tree48cb6a2e8165bb33ad2f034143b4a6a9b62a4285
parente745022d83ecd5fe33bb13cbf5d804ba46d24990 (diff)
Revert "colibri-imx7: eval: convert atmel mxt to syntactic sugar"
This reverts commit f8e8c2ddfa9e2d48dc158e17571c11631883f6b3. Syntactic sugar is not fully supported on 4.14 kernel revert all overlays for this branch Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
-rw-r--r--overlays/colibri-imx7-eval_atmel-mxt_overlay.dts81
1 files changed, 42 insertions, 39 deletions
diff --git a/overlays/colibri-imx7-eval_atmel-mxt_overlay.dts b/overlays/colibri-imx7-eval_atmel-mxt_overlay.dts
index b63394d..2f29eff 100644
--- a/overlays/colibri-imx7-eval_atmel-mxt_overlay.dts
+++ b/overlays/colibri-imx7-eval_atmel-mxt_overlay.dts
@@ -3,47 +3,50 @@
/dts-v1/;
/plugin/;
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/interrupt-controller/irq.h>
-#include <imx7d-pinfunc.h>
-
/ {
compatible = "toradex,colibri-imx7d-emmc";
-};
-
-&i2c4 {
- #address-cells = <1>;
- #size-cells = <0>;
-
- atmel_mxt_ts: atmel_mxt_ts@4a {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_atmel_mxt_ts>;
- compatible = "atmel,maxtouch";
- reg = <0x4a>;
- interrupt-parent = <&gpio1>;
- interrupts = <9 IRQ_TYPE_EDGE_FALLING>;
- reset-gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
- status = "okay";
+ fragment@0 {
+ target = <&i2c4>;
+ __overlay__ {
+ atmel_mxt_ts: atmel_mxt_ts@4a {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_atmel_mxt_ts>;
+ compatible = "atmel,maxtouch";
+ reg = <0x4a>;
+ interrupt-parent = <&gpio1>;
+ interrupts = <9 2>;
+ reset-gpios = <&gpio1 10 0>;
+ status = "okay";
+ };
+ };
};
-};
-
-&iomuxc_lpsr {
- pinctrl_atmel_mxt_ts: atmelmxttsgrp {
- fsl,pins = <
- MX7D_PAD_GPIO1_IO09__GPIO1_IO9 0x59
- MX7D_PAD_GPIO1_IO10__GPIO1_IO10 0x59
- >;
+ fragment@1 {
+ target = <&pwm2>;
+ __overlay__ {
+ status = "disabled";
+ };
+ };
+ fragment@2 {
+ target = <&pwm3>;
+ __overlay__{
+ status = "disabled";
+ };
+ };
+ fragment@3 {
+ target = <&iomuxc_lpsr>;
+ __overlay__ {
+ pinctrl_atmel_mxt_ts: atmelmxttsgrp {
+ fsl,pins = <
+ 0x0018 0x0270 0x0000 0x0 0x0 0x59
+ 0x001C 0x0274 0x0000 0x0 0x0 0x59
+ >;
+ };
+ };
+ };
+ fragment@4 {
+ target = <&uart1>;
+ __overlay__ {
+ pinctrl-0 = <&pinctrl_uart1 &pinctrl_uart1_ctrl1>;
+ };
};
-};
-
-&uart1 {
- pinctrl-0 = <&pinctrl_uart1 &pinctrl_uart1_ctrl1>;
-};
-
-&pwm2 {
- status = "disabled";
-};
-
-&pwm3 {
- status = "disabled";
};