apalis-imx6: convert ov5640 v1.1a/b to syntactic sugar

Convert an overlay file for CSI camera ov5640 V1.1B for Apalis iMX6 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 <oleksandr.suvorov@toradex.com>

1 files changed, 67 insertions, 81 deletions

diff --git a/overlays/apalis-imx6_ov5640_v11a_overlay.dts b/overlays/apalis-imx6_ov5640_v11a_overlay.dts
index 3bb877e..dbbd09a 100644
--- a/overlays/apalis-imx6_ov5640_v11a_overlay.dts
+++ b/overlays/apalis-imx6_ov5640_v11a_overlay.dts
@@ -10,103 +10,89 @@
 / {
 	compatible = "toradex,apalis_imx6q";
 
-	fragment@0 {
-		target-path="/";
-		__overlay__ {
-			reg_ov5640_1v8_d_o_vdd: regulator-ov5640-1v8-d-o-vdd {
-				compatible = "regulator-fixed";
-				regulator-name = "DOVDD/DVDD_1.8V";
-				regulator-min-microvolt = <1800000>;
-				regulator-max-microvolt = <1800000>;
-				regulator-always-on;
-				vin-supply = <&reg_3v3_sw>;
-			};
+	reg_ov5640_1v8_d_o_vdd: regulator-ov5640-1v8-d-o-vdd {
+		compatible = "regulator-fixed";
+		regulator-name = "DOVDD/DVDD_1.8V";
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <1800000>;
+		regulator-always-on;
+		vin-supply = <&reg_3v3_sw>;
+	};
 
-			reg_ov5640_2v8_a_vdd: regulator-ov5640-2v8-a-vdd {
-				compatible = "regulator-fixed";
-				regulator-name = "AVDD/AFVDD_2.8V";
-				regulator-min-microvolt = <2800000>;
-				regulator-max-microvolt = <2800000>;
-				regulator-always-on;
-				vin-supply = <&reg_3v3_sw>;
-			};
-		};
+	reg_ov5640_2v8_a_vdd: regulator-ov5640-2v8-a-vdd {
+		compatible = "regulator-fixed";
+		regulator-name = "AVDD/AFVDD_2.8V";
+		regulator-min-microvolt = <2800000>;
+		regulator-max-microvolt = <2800000>;
+		regulator-always-on;
+		vin-supply = <&reg_3v3_sw>;
 	};
+};
 
-	fragment@1 {
-		target-path = "/soc/aips-bus@2100000/i2c@21a8000";
-		__overlay__ {
-			#address-cells = <1>;
-			#size-cells = <0>;
-			status = "okay";
+&i2c1 {
+	#address-cells = <1>;
+	#size-cells = <0>;
+	status = "okay";
 
-			ov5640_mipi@3c {
-				compatible = "ovti,ov5640";
-				reg = <0x3c>;
-				pinctrl-names = "default";
-				pinctrl-0 = <&pinctrl_cam_mclk &pinctrl_apalis_gpio1 &pinctrl_csi_reset>;
-				clocks = <&clks IMX6QDL_CLK_CKO2>;
-				clock-names = "xclk";
-				DOVDD-supply = <&reg_ov5640_1v8_d_o_vdd>;
-				AVDD-supply = <&reg_ov5640_2v8_a_vdd>;
-				DVDD-supply = <&reg_ov5640_1v8_d_o_vdd>;
-				powerdown-gpios = <&gpio2 5 GPIO_ACTIVE_HIGH>;
-				reset-gpios = <&gpio2 4 GPIO_ACTIVE_LOW>;
-				status = "okay";
+	ov5640_mipi@3c {
+		compatible = "ovti,ov5640";
+		reg = <0x3c>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_cam_mclk &pinctrl_apalis_gpio1 &pinctrl_csi_reset>;
+		clocks = <&clks IMX6QDL_CLK_CKO2>;
+		clock-names = "xclk";
+		DOVDD-supply = <&reg_ov5640_1v8_d_o_vdd>;
+		AVDD-supply = <&reg_ov5640_2v8_a_vdd>;
+		DVDD-supply = <&reg_ov5640_1v8_d_o_vdd>;
+		powerdown-gpios = <&gpio2 5 GPIO_ACTIVE_HIGH>;
+		reset-gpios = <&gpio2 4 GPIO_ACTIVE_LOW>;
+		status = "okay";
 
-				port {
-					/* MIPI CSI bus endpoint */
-					ov5640_to_mipi_csi2: endpoint {
-						remote-endpoint = <&mipi_csi_from_ov5640>;
-						clock-lanes = <0>;
-						data-lanes = <1 2>;
-					};
-				};
+		port {
+			/* MIPI CSI bus endpoint */
+			ov5640_to_mipi_csi2: endpoint {
+				remote-endpoint = <&mipi_csi_from_ov5640>;
+				clock-lanes = <0>;
+				data-lanes = <1 2>;
 			};
 		};
 	};
+};
 
-	fragment@2 {
-		target-path = "/soc/aips-bus@2100000/mipi@21dc000/";
-		__overlay__ {
-			#address-cells = <1>;
-			#size-cells = <0>;
-			status = "okay";
+&mipi_csi {
+	#address-cells = <1>;
+	#size-cells = <0>;
+	status = "okay";
 
-			port@0 {
-				reg = <0>;
+	port@0 {
+		reg = <0>;
 
-				mipi_csi_from_ov5640: endpoint {
-					remote-endpoint = <&ov5640_to_mipi_csi2>;
-					clock-lanes = <0>;
-					data-lanes = <1 2>;
-				};
-			};
+		mipi_csi_from_ov5640: endpoint {
+			remote-endpoint = <&ov5640_to_mipi_csi2>;
+			clock-lanes = <0>;
+			data-lanes = <1 2>;
 		};
 	};
+};
 
-	fragment@3 {
-		target-path = "/soc/aips-bus@2000000/iomuxc@20e0000/";
-		__overlay__ {
-			pinctrl-0 = <&pinctrl_apalis_gpio2 &pinctrl_apalis_gpio3
-				     &pinctrl_apalis_gpio4 &pinctrl_apalis_gpio5
-				     &pinctrl_apalis_gpio6 &pinctrl_apalis_gpio7
-				     &pinctrl_apalis_gpio8
-				    >;
+&iomuxc {
+	pinctrl-0 = <&pinctrl_apalis_gpio2 &pinctrl_apalis_gpio3
+		     &pinctrl_apalis_gpio4 &pinctrl_apalis_gpio5
+		     &pinctrl_apalis_gpio6 &pinctrl_apalis_gpio7
+		     &pinctrl_apalis_gpio8
+	>;
 
-			pinctrl_cam_mclk: cammclkgrp {
-				fsl,pins = <
-					/* CAM sys_mclk */
-					MX6QDL_PAD_NANDF_CS2__CCM_CLKO2  0x00b0
-				>;
-			};
+	pinctrl_cam_mclk: cammclkgrp {
+		fsl,pins = <
+			/* CAM sys_mclk */
+			MX6QDL_PAD_NANDF_CS2__CCM_CLKO2  0x00b0
+		>;
+	};
 
-			pinctrl_csi_reset: csiresetgrp {
-				fsl,pins = <
-					MX6QDL_PAD_NANDF_D4__GPIO2_IO04 0x130b0 /* reset */
-				>;
-			};
-		};
+	pinctrl_csi_reset: csiresetgrp {
+		fsl,pins = <
+			MX6QDL_PAD_NANDF_D4__GPIO2_IO04 0x130b0 /* reset */
+		>;
 	};
 };