overlays: cosmetic clean-up

Cosmetic clean-up without any functional impact:
- white space clean-up
- re-order nodes/properties
- adding missing new lines
- remove obsolete includes
- remove spurious new lines
- change 7", 7inch, 10" and 10inch consistently to 7 inch resp. 10 inch

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>

39 files changed, 89 insertions, 93 deletions

diff --git a/overlays/apalis-imx6_atmel-mxt_overlay.dts b/overlays/apalis-imx6_atmel-mxt_overlay.dts
index 7232e27..c4e166b 100644
--- a/overlays/apalis-imx6_atmel-mxt_overlay.dts
+++ b/overlays/apalis-imx6_atmel-mxt_overlay.dts
@@ -3,14 +3,11 @@
  * Copyright 2020-2021 Toradex
  */
 
-// Atmel MXT touchscreen for the 7inch and 10inch display orderable at Toradex.
+// Atmel MXT touchscreen for the 7 inch and 10 inch display orderable at Toradex.
 
 /dts-v1/;
 /plugin/;
 
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/interrupt-controller/irq.h>
-
 / {
 	compatible = "toradex,apalis_imx6q";
 };
diff --git a/overlays/apalis-imx6_fusion-f0710a_overlay.dts b/overlays/apalis-imx6_fusion-f0710a_overlay.dts
index faea7ee..62957e3 100644
--- a/overlays/apalis-imx6_fusion-f0710a_overlay.dts
+++ b/overlays/apalis-imx6_fusion-f0710a_overlay.dts
@@ -3,7 +3,7 @@
  * Copyright 2020-2021 Toradex
  */
 
-// Overlay for Fusion 7" and 10" capacitive multi-touch displays
+// Overlay for legacy Fusion 7 inch and 10 inch capacitive multi-touch displays
 
 /dts-v1/;
 /plugin/;
diff --git a/overlays/apalis-imx6_hdmi_overlay.dts b/overlays/apalis-imx6_hdmi_overlay.dts
index 60d60eb..7fb368e 100644
--- a/overlays/apalis-imx6_hdmi_overlay.dts
+++ b/overlays/apalis-imx6_hdmi_overlay.dts
@@ -20,11 +20,11 @@
 	status = "okay";
 };
 
-&hdmi_ddc {
+&hdmi_core {
 	status = "okay";
 };
 
-&hdmi_core {
+&hdmi_ddc {
 	status = "okay";
 };
 
diff --git a/overlays/apalis-imx6_lcd-lt161010_overlay.dts b/overlays/apalis-imx6_lcd-lt161010_overlay.dts
index bcf22a4..3a873d9 100644
--- a/overlays/apalis-imx6_lcd-lt161010_overlay.dts
+++ b/overlays/apalis-imx6_lcd-lt161010_overlay.dts
@@ -3,7 +3,7 @@
  * Copyright 2020-2021 Toradex
  */
 
-// Enable the parallel RGB interface with setting for 7" Displays on the Apalis iMX6Q
+// Enable the parallel RGB interface with setting for 7 inch Displays on the Apalis iMX6Q
 
 /dts-v1/;
 /plugin/;
diff --git a/overlays/apalis-imx6_stmpe-ts_overlay.dts b/overlays/apalis-imx6_stmpe-ts_overlay.dts
index d58da64..1339f69 100644
--- a/overlays/apalis-imx6_stmpe-ts_overlay.dts
+++ b/overlays/apalis-imx6_stmpe-ts_overlay.dts
@@ -3,7 +3,7 @@
  * Copyright 2020-2021 Toradex
  */
 
-// Resitive STMPE touchscreen for the 7inch resistive touch display orderable at Toradex.
+// Resitive STMPE touchscreen for the 7 inch resistive touch display orderable at Toradex.
 
 /dts-v1/;
 /plugin/;
diff --git a/overlays/apalis-imx8_ar0521_overlay.dts b/overlays/apalis-imx8_ar0521_overlay.dts
index 78c4ee3..a9a5dd9 100644
--- a/overlays/apalis-imx8_ar0521_overlay.dts
+++ b/overlays/apalis-imx8_ar0521_overlay.dts
@@ -8,26 +8,12 @@
 /dts-v1/;
 /plugin/;
 
-#include <dt-bindings/clock/imx8-clock.h>
 #include <dt-bindings/gpio/gpio.h>
 
 / {
 	compatible = "toradex,apalis-imx8";
 };
 
-&iomuxc {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_cam1_gpios>, <&pinctrl_dap1_gpios>,
-		    <&pinctrl_esai0_gpios>, <&pinctrl_fec2_gpios>,
-		    <&pinctrl_gpio3>, <&pinctrl_gpio4>,
-		    <&pinctrl_gpio_usbh_oc_n>, <&pinctrl_lpuart1ctrl>,
-		    <&pinctrl_lvds0_i2c0_gpio>, <&pinctrl_lvds1_i2c0_gpios>,
-		    <&pinctrl_mipi_dsi_0_1_en>, <&pinctrl_mipi_dsi1_gpios>,
-		    <&pinctrl_mlb_gpios>, <&pinctrl_qspi1a_gpios>,
-		    <&pinctrl_sata1_act>, <&pinctrl_sim0_gpios>,
-		    <&pinctrl_usdhc1_gpios>;
-};
-
 /* Apalis I2C3 (CAM) */
 &i2c3 {
 	#address-cells = <1>;
@@ -58,6 +44,19 @@
 	};
 };
 
+&iomuxc {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_cam1_gpios>, <&pinctrl_dap1_gpios>,
+		    <&pinctrl_esai0_gpios>, <&pinctrl_fec2_gpios>,
+		    <&pinctrl_gpio3>, <&pinctrl_gpio4>,
+		    <&pinctrl_gpio_usbh_oc_n>, <&pinctrl_lpuart1ctrl>,
+		    <&pinctrl_lvds0_i2c0_gpio>, <&pinctrl_lvds1_i2c0_gpios>,
+		    <&pinctrl_mipi_dsi_0_1_en>, <&pinctrl_mipi_dsi1_gpios>,
+		    <&pinctrl_mlb_gpios>, <&pinctrl_qspi1a_gpios>,
+		    <&pinctrl_sata1_act>, <&pinctrl_sim0_gpios>,
+		    <&pinctrl_usdhc1_gpios>;
+};
+
 &isi_4 {
 	status = "okay";
 
diff --git a/overlays/apalis-imx8_atmel-mxt_overlay.dts b/overlays/apalis-imx8_atmel-mxt_overlay.dts
index 387febe..a823f67 100644
--- a/overlays/apalis-imx8_atmel-mxt_overlay.dts
+++ b/overlays/apalis-imx8_atmel-mxt_overlay.dts
@@ -3,7 +3,7 @@
  * Copyright 2020-2021 Toradex
  */
 
-// Atmel MXT touchscreen for the 7inch and 10inch display orderable at Toradex.
+// Atmel MXT touchscreen for the 7 inch and 10 inch display orderable at Toradex.
 
 /dts-v1/;
 /plugin/;
diff --git a/overlays/apalis-imx8_ov5640-2_overlay.dts b/overlays/apalis-imx8_ov5640-2_overlay.dts
index 9bda990..4434a33 100644
--- a/overlays/apalis-imx8_ov5640-2_overlay.dts
+++ b/overlays/apalis-imx8_ov5640-2_overlay.dts
@@ -8,7 +8,6 @@
 /dts-v1/;
 /plugin/;
 
-#include <dt-bindings/clock/imx8-clock.h>
 #include <dt-bindings/gpio/gpio.h>
 
 / {
diff --git a/overlays/apalis-imx8_ov5640_overlay.dts b/overlays/apalis-imx8_ov5640_overlay.dts
index 6b60b76..4fc81f1 100644
--- a/overlays/apalis-imx8_ov5640_overlay.dts
+++ b/overlays/apalis-imx8_ov5640_overlay.dts
@@ -8,7 +8,6 @@
 /dts-v1/;
 /plugin/;
 
-#include <dt-bindings/clock/imx8-clock.h>
 #include <dt-bindings/gpio/gpio.h>
 
 / {
diff --git a/overlays/apalis-imx8x_atmel-mxt_overlay.dts b/overlays/apalis-imx8x_atmel-mxt_overlay.dts
index be7a477..aac12ac 100644
--- a/overlays/apalis-imx8x_atmel-mxt_overlay.dts
+++ b/overlays/apalis-imx8x_atmel-mxt_overlay.dts
@@ -3,7 +3,7 @@
  * Copyright 2020-2021 Toradex
  */
 
-// Atmel MXT touchscreen for the 7inch and 10inch display orderable at Toradex.
+// Atmel MXT touchscreen for the 7 inch and 10 inch display orderable at Toradex.
 
 /dts-v1/;
 /plugin/;
diff --git a/overlays/apalis-imx8x_dsihdmi_overlay.dts b/overlays/apalis-imx8x_dsihdmi_overlay.dts
index e388c51..36c90cc 100644
--- a/overlays/apalis-imx8x_dsihdmi_overlay.dts
+++ b/overlays/apalis-imx8x_dsihdmi_overlay.dts
@@ -14,6 +14,10 @@
 	compatible = "toradex,apalis-imx8x";
 };
 
+&i2c0_mipi_lvds1 {
+	status = "okay";
+};
+
 &lt8912_hdmi {
 	status = "okay";
 
@@ -45,10 +49,6 @@
 	};
 };
 
-&i2c0_mipi_lvds1 {
-	status = "okay";
-};
-
 /* On-module GPIO Expander */
 &pcal6416_1 {
 	/*
@@ -62,7 +62,7 @@
 	 LVDS1B_HDMI_MUX {
 		gpio-hog;
 		gpios = <14 GPIO_ACTIVE_HIGH>;
-		output-high;
 		line-name = "LVDS1_HDMI_MUX";
+		output-high;
 	};
 };
diff --git a/overlays/apalis-imx8x_lvds_overlay.dts b/overlays/apalis-imx8x_lvds_overlay.dts
index fc00588..ed8e21f 100644
--- a/overlays/apalis-imx8x_lvds_overlay.dts
+++ b/overlays/apalis-imx8x_lvds_overlay.dts
@@ -3,7 +3,7 @@
  * Copyright 2020-2021 Toradex
  */
 
-// LT170410 display (10inch) with a resolution of 1280x800 pixel. This display can be ordered at Toradex.
+// LT170410 display (10 inch) with a resolution of 1280x800 pixel. This display can be ordered at Toradex.
 
 /dts-v1/;
 /plugin/;
diff --git a/overlays/colibri-imx6_atmel-mxt-adapter_overlay.dts b/overlays/colibri-imx6_atmel-mxt-adapter_overlay.dts
index 10d29e7..23c8168 100644
--- a/overlays/colibri-imx6_atmel-mxt-adapter_overlay.dts
+++ b/overlays/colibri-imx6_atmel-mxt-adapter_overlay.dts
@@ -3,7 +3,7 @@
  * Copyright 2020-2021 Toradex
  */
 
-// Atmel MXT touchscreen for the 7inch and 10inch display orderable at Toradex. Compatible with a Capacitive Touch Adapter.
+// Atmel MXT touchscreen for the 7 inch and 10 inch display orderable at Toradex. Compatible with a Capacitive Touch Adapter.
 
 /dts-v1/;
 /plugin/;
diff --git a/overlays/colibri-imx6_atmel-mxt-connector_overlay.dts b/overlays/colibri-imx6_atmel-mxt-connector_overlay.dts
index 6e24cf6..dde1e8d 100644
--- a/overlays/colibri-imx6_atmel-mxt-connector_overlay.dts
+++ b/overlays/colibri-imx6_atmel-mxt-connector_overlay.dts
@@ -3,7 +3,7 @@
  * Copyright 2020-2021 Toradex
  */
 
-// Atmel touchscreen for the 7inch and 10inch capacitive display orderable at Toradex. Compatible with a Capacitive Touch Connector.
+// Atmel touchscreen for the 7 inch and 10 inch capacitive display orderable at Toradex. Compatible with a Capacitive Touch Connector.
 
 /dts-v1/;
 /plugin/;
diff --git a/overlays/colibri-imx6_fusion-f0710a-connector_overlay.dts b/overlays/colibri-imx6_fusion-f0710a-connector_overlay.dts
index ed39d4d..1ed8c7c 100644
--- a/overlays/colibri-imx6_fusion-f0710a-connector_overlay.dts
+++ b/overlays/colibri-imx6_fusion-f0710a-connector_overlay.dts
@@ -20,8 +20,8 @@
 
 &fusion_f0710a {
 	pinctrl-0 = <&pinctrl_atmel_conn>;
-	gpios = <&gpio2 24 GPIO_ACTIVE_HIGH /* SODIMM 107, Pen intr */
-		 &gpio1 14 GPIO_ACTIVE_LOW  /* SODIMM 106, Reset */
+	gpios = <&gpio2 24 GPIO_ACTIVE_HIGH	/* SODIMM 107, Pen intr */
+		 &gpio1 14 GPIO_ACTIVE_LOW	/* SODIMM 106, Reset */
 		>;
 	status = "okay";
 };
diff --git a/overlays/colibri-imx6_hdmi_overlay.dts b/overlays/colibri-imx6_hdmi_overlay.dts
index 7bb4b39..83bf5fc 100644
--- a/overlays/colibri-imx6_hdmi_overlay.dts
+++ b/overlays/colibri-imx6_hdmi_overlay.dts
@@ -16,11 +16,11 @@
 	status = "okay";
 };
 
-&hdmi_ddc {
+&hdmi_core {
 	status = "okay";
 };
 
-&hdmi_core {
+&hdmi_ddc {
 	status = "okay";
 };
 
diff --git a/overlays/colibri-imx6_lcd-lt161010_overlay.dts b/overlays/colibri-imx6_lcd-lt161010_overlay.dts
index b94363c..cf805a1 100644
--- a/overlays/colibri-imx6_lcd-lt161010_overlay.dts
+++ b/overlays/colibri-imx6_lcd-lt161010_overlay.dts
@@ -3,7 +3,7 @@
  * Copyright 2020-2021 Toradex
  */
 
-// Turn on the parallel RGB interface with setting for 7" Displays on the Colibri iMX6DL
+// Turn on the parallel RGB interface with setting for 7 inch Displays on the Colibri iMX6DL
 
 /dts-v1/;
 /plugin/;
diff --git a/overlays/colibri-imx6_lcd-lt170410_overlay.dts b/overlays/colibri-imx6_lcd-lt170410_overlay.dts
index e87e6bd..dbd495d 100644
--- a/overlays/colibri-imx6_lcd-lt170410_overlay.dts
+++ b/overlays/colibri-imx6_lcd-lt170410_overlay.dts
@@ -4,7 +4,7 @@
  */
 
 // Enable the LCDIF interface, tuning settings for
-// Toradex Cap LVDS 10" Display on the Colibri iMX6DL
+// Toradex Cap LVDS 10 inch Display on the Colibri iMX6DL
 
 /dts-v1/;
 /plugin/;
diff --git a/overlays/colibri-imx6_stmpe-ts_overlay.dts b/overlays/colibri-imx6_stmpe-ts_overlay.dts
index 9103e19..c44925d 100644
--- a/overlays/colibri-imx6_stmpe-ts_overlay.dts
+++ b/overlays/colibri-imx6_stmpe-ts_overlay.dts
@@ -3,7 +3,7 @@
  * Copyright 2020-2021 Toradex
  */
 
-// Resitive STMPE touchscreen for the 7inch resistive touch display orderable at Toradex.
+// Resitive STMPE touchscreen for the 7 inch resistive touch display orderable at Toradex.
 
 /dts-v1/;
 /plugin/;
diff --git a/overlays/colibri-imx7_atmel-mxt-adapter_overlay.dts b/overlays/colibri-imx7_atmel-mxt-adapter_overlay.dts
index 58f85dd..64d98cc 100644
--- a/overlays/colibri-imx7_atmel-mxt-adapter_overlay.dts
+++ b/overlays/colibri-imx7_atmel-mxt-adapter_overlay.dts
@@ -3,7 +3,7 @@
  * Copyright 2020-2021 Toradex
  */
 
-// Atmel touchscreen for the 7inch capacitive display orderable at Toradex. Use this devicetree on the Evaluation or Iris board.
+// Atmel touchscreen for the 7 inch capacitive display orderable at Toradex. Use this devicetree on the Evaluation or Iris board.
 
 /dts-v1/;
 /plugin/;
@@ -13,8 +13,8 @@
 
 / {
 	compatible = "toradex,colibri-imx7d",
-		     "toradex,colibri-imx7s",
-		     "toradex,colibri-imx7d-emmc";
+		     "toradex,colibri-imx7d-emmc",
+		     "toradex,colibri-imx7s";
 };
 
 &atmel_mxt_ts {
@@ -25,14 +25,14 @@
 	status = "okay";
 };
 
-&i2c4 {
-	status = "okay";
-};
-
 &fusion_f0710a {
 	status = "disabled";
 };
 
+&i2c4 {
+	status = "okay";
+};
+
 &pwm2 {
 	status = "disabled";
 };
diff --git a/overlays/colibri-imx7_atmel-mxt-connector_overlay.dts b/overlays/colibri-imx7_atmel-mxt-connector_overlay.dts
index fd09c8b..2dcadd4 100644
--- a/overlays/colibri-imx7_atmel-mxt-connector_overlay.dts
+++ b/overlays/colibri-imx7_atmel-mxt-connector_overlay.dts
@@ -3,7 +3,7 @@
  * Copyright 2020-2021 Toradex
  */
 
-// Atmel touchscreen for the 7inch capacitive display orderable at Toradex. Use this devicetree on the Aster board.
+// Atmel touchscreen for the 7 inch capacitive display orderable at Toradex. Use this devicetree on the Aster board.
 
 /dts-v1/;
 /plugin/;
@@ -11,8 +11,8 @@
 
 / {
 	compatible = "toradex,colibri-imx7d",
-		     "toradex,colibri-imx7s",
-		     "toradex,colibri-imx7d-emmc";
+		     "toradex,colibri-imx7d-emmc",
+		     "toradex,colibri-imx7s";
 };
 
 &atmel_mxt_ts {
@@ -20,7 +20,7 @@
 };
 
 &fusion_f0710a {
-        status = "disabled";
+	status = "disabled";
 };
 
 &i2c4 {
diff --git a/overlays/colibri-imx7_fusion-f0710a-adapter_overlay.dts b/overlays/colibri-imx7_fusion-f0710a-adapter_overlay.dts
index 362314f..7fb3710 100644
--- a/overlays/colibri-imx7_fusion-f0710a-adapter_overlay.dts
+++ b/overlays/colibri-imx7_fusion-f0710a-adapter_overlay.dts
@@ -9,9 +9,9 @@
 /plugin/;
 
 / {
-        compatible = "toradex,colibri-imx7d",
-		     "toradex,colibri-imx7s",
-		     "toradex,colibri-imx7d-emmc";
+	compatible = "toradex,colibri-imx7d",
+		     "toradex,colibri-imx7d-emmc",
+		     "toradex,colibri-imx7s";
 };
 
 &atmel_mxt_ts {
@@ -27,10 +27,9 @@
 };
 
 &pwm2 {
-        status = "disabled";
+	status = "disabled";
 };
 
 &pwm3 {
-        status = "disabled";
+	status = "disabled";
 };
-
diff --git a/overlays/colibri-imx7_fusion-f0710a-connector_overlay.dts b/overlays/colibri-imx7_fusion-f0710a-connector_overlay.dts
index 5506fce..6c9df6b 100644
--- a/overlays/colibri-imx7_fusion-f0710a-connector_overlay.dts
+++ b/overlays/colibri-imx7_fusion-f0710a-connector_overlay.dts
@@ -11,9 +11,9 @@
 #include <dt-bindings/gpio/gpio.h>
 
 / {
-        compatible = "toradex,colibri-imx7d",
-		     "toradex,colibri-imx7s",
-		     "toradex,colibri-imx7d-emmc";
+	compatible = "toradex,colibri-imx7d",
+		     "toradex,colibri-imx7d-emmc",
+		     "toradex,colibri-imx7s";
 };
 
 &atmel_mxt_ts {
@@ -22,8 +22,8 @@
 
 &fusion_f0710a {
 	pinctrl-0 = <&pinctrl_atmel_connector>;
-	gpios = <&gpio2 15 GPIO_ACTIVE_HIGH /* SODIMM 107, INT */
-		 &gpio2 28 GPIO_ACTIVE_LOW  /* SODIMM 106, RST */
+	gpios = <&gpio2 15 GPIO_ACTIVE_HIGH	/* SODIMM 107, INT */
+		 &gpio2 28 GPIO_ACTIVE_LOW	/* SODIMM 106, RST */
 		>;
 	status = "okay";
 };
diff --git a/overlays/colibri-imx7_lcd-lt161010_overlay.dts b/overlays/colibri-imx7_lcd-lt161010_overlay.dts
index 4625287..98760b9 100644
--- a/overlays/colibri-imx7_lcd-lt161010_overlay.dts
+++ b/overlays/colibri-imx7_lcd-lt161010_overlay.dts
@@ -3,7 +3,7 @@
  * Copyright 2020-2021 Toradex
  */
 
-// Enable the parallel RGB interface with settings for 7" Displays on the Colibri iMX7
+// Enable the parallel RGB interface with settings for 7 inch Displays on the Colibri iMX7
 
 /dts-v1/;
 /plugin/;
diff --git a/overlays/colibri-imx7_lcd-lt170410_overlay.dts b/overlays/colibri-imx7_lcd-lt170410_overlay.dts
index 4cb2a8d..c8d0aff 100644
--- a/overlays/colibri-imx7_lcd-lt170410_overlay.dts
+++ b/overlays/colibri-imx7_lcd-lt170410_overlay.dts
@@ -4,7 +4,7 @@
  */
 
 // Enable the LCDIF interface, tuning settings for
-// Toradex Cap LVDS 10" Display on the Colibri iMX7
+// Toradex Cap LVDS 10 inch Display on the Colibri iMX7
 
 /dts-v1/;
 /plugin/;
diff --git a/overlays/colibri-imx7_lcd-vga_overlay.dts b/overlays/colibri-imx7_lcd-vga_overlay.dts
index 3f484fb..9308ecc 100644
--- a/overlays/colibri-imx7_lcd-vga_overlay.dts
+++ b/overlays/colibri-imx7_lcd-vga_overlay.dts
@@ -10,21 +10,20 @@
 
 / {
 	compatible = "toradex,colibri-imx7d",
-		     "toradex,colibri-imx7s",
-		     "toradex,colibri-imx7d-emmc";
+		     "toradex,colibri-imx7d-emmc",
+		     "toradex,colibri-imx7s";
 };
 
-&display0 {
-        display-timings {
-                native-mode = <&timing_vga>;
-        };
-};
-
-
 &backlight {
 	status = "okay";
 };
 
+&display0 {
+	display-timings {
+		native-mode = <&timing_vga>;
+	};
+};
+
 &lcdif {
 	status = "okay";
 };
diff --git a/overlays/colibri-imx8x_atmel-mxt-adapter_overlay.dts b/overlays/colibri-imx8x_atmel-mxt-adapter_overlay.dts
index 018b3f0..aad0af8 100644
--- a/overlays/colibri-imx8x_atmel-mxt-adapter_overlay.dts
+++ b/overlays/colibri-imx8x_atmel-mxt-adapter_overlay.dts
@@ -4,7 +4,7 @@
  */
 
 // Atmel MXT touchscreen for Capacitive Touch Adapter.
-// Supports the 7inch and 10inch capacitive touch displays orderable at Toradex.
+// Supports the 7 inch and 10 inch capacitive touch displays orderable at Toradex.
 
 /dts-v1/;
 /plugin/;
diff --git a/overlays/colibri-imx8x_atmel-mxt-connector_overlay.dts b/overlays/colibri-imx8x_atmel-mxt-connector_overlay.dts
index 5adba07..1dfa586 100644
--- a/overlays/colibri-imx8x_atmel-mxt-connector_overlay.dts
+++ b/overlays/colibri-imx8x_atmel-mxt-connector_overlay.dts
@@ -3,7 +3,7 @@
  * Copyright 2020-2021 Toradex
  */
 
-// Atmel MXT touchscreen for boards with TS connector. Supports the 7inch and 10inch display orderable at Toradex.
+// Atmel MXT touchscreen for boards with TS connector. Supports the 7 inch and 10 inch display orderable at Toradex.
 
 /dts-v1/;
 /plugin/;
@@ -12,10 +12,10 @@
 	compatible = "toradex,colibri-imx8x";
 };
 
-&i2c1 {
+&atmel_mxt_ts {
 	status = "okay";
 };
 
-&atmel_mxt_ts {
+&i2c1 {
 	status = "okay";
 };
diff --git a/overlays/colibri-imx8x_dsihdmi_overlay.dts b/overlays/colibri-imx8x_dsihdmi_overlay.dts
index 78f2d71..2b7335c 100644
--- a/overlays/colibri-imx8x_dsihdmi_overlay.dts
+++ b/overlays/colibri-imx8x_dsihdmi_overlay.dts
@@ -19,11 +19,11 @@
 	status = "okay";
 };
 
-&mipi0_dsi_host {
+&mipi0_dphy {
 	status = "okay";
 };
 
-&mipi0_dphy {
+&mipi0_dsi_host {
 	status = "okay";
 };
 
diff --git a/overlays/colibri-imx8x_parallel-rgb_overlay.dts b/overlays/colibri-imx8x_parallel-rgb_overlay.dts
index a65afa1..ccea1c6 100644
--- a/overlays/colibri-imx8x_parallel-rgb_overlay.dts
+++ b/overlays/colibri-imx8x_parallel-rgb_overlay.dts
@@ -12,7 +12,7 @@
 };
 
 &adma_pwm {
-        status = "okay";
+	status = "okay";
 };
 
 &adma_pwm_lpcg {
@@ -20,7 +20,7 @@
 };
 
 &backlight {
-        status = "okay";
+	status = "okay";
 };
 
 &display_lcdif {
diff --git a/overlays/display-dpi-lt170410_overlay.dts b/overlays/display-dpi-lt170410_overlay.dts
index 108baad..d042c4a 100644
--- a/overlays/display-dpi-lt170410_overlay.dts
+++ b/overlays/display-dpi-lt170410_overlay.dts
@@ -3,7 +3,7 @@
  * Copyright 2020-2021 Toradex
  */
 
-// LT170410 display (10inch) connected to DPI-LVDS converter with a resolution of 1280x800 pixel.
+// LT170410 display (10 inch) connected to DPI-LVDS converter with a resolution of 1280x800 pixel.
 // This display can be ordered at Toradex.
 
 /dts-v1/;
diff --git a/overlays/display-edt5.7_overlay.dts b/overlays/display-edt5.7_overlay.dts
index 7599621..f9166f9 100644
--- a/overlays/display-edt5.7_overlay.dts
+++ b/overlays/display-edt5.7_overlay.dts
@@ -23,6 +23,7 @@
 	status = "okay";
 	width-mm = <116>;
 	height-mm = <86>;
+
 	panel-timing {
 		clock-frequency = <25175000>;
 		hactive = <640>;
diff --git a/overlays/display-edt7_overlay.dts b/overlays/display-edt7_overlay.dts
index 31da57a..eff371e 100644
--- a/overlays/display-edt7_overlay.dts
+++ b/overlays/display-edt7_overlay.dts
@@ -23,6 +23,7 @@
 	status = "okay";
 	width-mm = <155>;
 	height-mm = <91>;
+
 	panel-timing {
 		clock-frequency = <33230769>;
 		hactive = <800>;
diff --git a/overlays/display-fullhd_overlay.dts b/overlays/display-fullhd_overlay.dts
index 617e23c..74cd30b 100644
--- a/overlays/display-fullhd_overlay.dts
+++ b/overlays/display-fullhd_overlay.dts
@@ -22,6 +22,7 @@
 	status = "okay";
 	width-mm = <155>;
 	height-mm = <91>;
+
 	panel-timing {
 		clock-frequency = <148500000>;
 		hactive = <1920>;
diff --git a/overlays/display-lt161010_overlay.dts b/overlays/display-lt161010_overlay.dts
index dcadffd..9b08c66 100644
--- a/overlays/display-lt161010_overlay.dts
+++ b/overlays/display-lt161010_overlay.dts
@@ -3,7 +3,7 @@
  * Copyright 2020-2021 Toradex
  */
 
-// LT161010 display (7inch) with a resolution of 800x480 pixel. This display can be ordered at Toradex.
+// LT161010 display (7 inch) with a resolution of 800x480 pixel. This display can be ordered at Toradex.
 
 /dts-v1/;
 /plugin/;
@@ -14,8 +14,8 @@
 		     "toradex,colibri_imx6dl",
 		     "toradex,colibri-imx6ull",
 		     "toradex,colibri-imx7d",
-		     "toradex,colibri-imx7s",
 		     "toradex,colibri-imx7d-emmc",
+		     "toradex,colibri-imx7s",
 		     "toradex,colibri-imx8x";
 };
 
@@ -23,6 +23,7 @@
 	status = "okay";
 	width-mm = <154>;
 	height-mm = <86>;
+
 	panel-timing {
 		clock-frequency = <33230769>;
 		hactive = <800>;
diff --git a/overlays/display-vga_overlay.dts b/overlays/display-vga_overlay.dts
index 84af476..2d6b0e2 100644
--- a/overlays/display-vga_overlay.dts
+++ b/overlays/display-vga_overlay.dts
@@ -24,6 +24,7 @@
 	/* for 0.3mm pixels */
 	width-mm = <192>;
 	height-mm = <144>;
+
 	panel-timing {
 		clock-frequency = <25175000>;
 		hactive = <640>;
diff --git a/overlays/touch-atmel-mxt_overlay.dts b/overlays/touch-atmel-mxt_overlay.dts
index 99fd9f0..849ca8f 100644
--- a/overlays/touch-atmel-mxt_overlay.dts
+++ b/overlays/touch-atmel-mxt_overlay.dts
@@ -3,7 +3,7 @@
  * Copyright 2020-2021 Toradex
  */
 
-// Atmel MXT touchscreen for the 7inch and 10inch display orderable at Toradex.
+// Atmel MXT touchscreen for the 7 inch and 10 inch display orderable at Toradex.
 
 /dts-v1/;
 /plugin/;
diff --git a/overlays/verdin-imx8mp_native-hdmi_overlay.dts b/overlays/verdin-imx8mp_native-hdmi_overlay.dts
index 602d7e3..61d3416 100644
--- a/overlays/verdin-imx8mp_native-hdmi_overlay.dts
+++ b/overlays/verdin-imx8mp_native-hdmi_overlay.dts
@@ -64,4 +64,3 @@
 &sound_hdmi {
 	status = "okay";
 };
-
diff --git a/overlays/verdin-imx8mp_sn65dsi84_overlay.dts b/overlays/verdin-imx8mp_sn65dsi84_overlay.dts
index 60147e6..724cc08 100644
--- a/overlays/verdin-imx8mp_sn65dsi84_overlay.dts
+++ b/overlays/verdin-imx8mp_sn65dsi84_overlay.dts
@@ -24,6 +24,11 @@
 	status = "okay";
 };
 
+/* LCDIF to MIPI-DSI */
+&lcdif1 {
+	status = "okay";
+};
+
 &lvds_ti_sn65dsi83 {
 	status = "okay";
 
@@ -34,11 +39,6 @@
 	};
 };
 
-/* LCDIF to MIPI-DSI */
-&lcdif1 {
-	status = "okay";
-};
-
 &mipi_dsi {
 	#address-cells = <1>;
 	#size-cells = <0>;