Merge pull request #286 from CodeChenL/main

refactor: all compute module overlays are replaced with reference syntax

Author: RadxaYuntian

arch/arm64/boot/dts/rockchip/overlays/audioinjector-isolated-soundcard.dts

@@ -11,57 +11,45 @@
 		category = "misc";
 		description = "Enable Audio Injector Isolated Soundcard";
 	};
+};
 
-	fragment@0 {
-		target = <&i2s3_2ch>;
-		__overlay__ {
-			status = "okay";
-		};
-	};
+&i2s3_2ch {
+	status = "okay";
+};
 
-	fragment@1 {
-		target-path = "/";
-		__overlay__ {
-			cs4272_mclk: codec-mclk {
-				compatible = "fixed-clock";
-				#clock-cells = <0>;
-				clock-frequency = <24576000>;
-			};
-		};
+&{/} {
+	cs4272_mclk: codec-mclk {
+		compatible = "fixed-clock";
+		#clock-cells = <0>;
+		clock-frequency = <24576000>;
 	};
+};
 
-	fragment@2 {
-		target = <&i2c3>;
-		__overlay__ {
-			#address-cells = <1>;
-			#size-cells = <0>;
-			status = "okay";
-			pinctrl-0 = <&i2c3m0_xfer>;
+&i2c3 {
+	#address-cells = <1>;
+	#size-cells = <0>;
+	status = "okay";
+	pinctrl-0 = <&i2c3m0_xfer>;
 
-			cs4272: cs4272@10 {
-				#sound-dai-cells = <0>;
-				compatible = "cirrus,cs4271";
-				reg = <0x10>;
-				//reset-gpio = <&gpio 5 0>;
-				reset-gpio = <&gpio2 RK_PD7 GPIO_ACTIVE_HIGH>;
-				clocks = <&cs4272_mclk>;
-				clock-names = "mclk";
-				status = "okay";
-			};
-		};
+	cs4272: cs4272@10 {
+		#sound-dai-cells = <0>;
+		compatible = "cirrus,cs4271";
+		reg = <0x10>;
+		//reset-gpio = <&gpio 5 0>;
+		reset-gpio = <&gpio2 RK_PD7 GPIO_ACTIVE_HIGH>;
+		clocks = <&cs4272_mclk>;
+		clock-names = "mclk";
+		status = "okay";
 	};
+};
 
-	fragment@3 {
-		target-path = "/";
-		__overlay__ {
-			sound {
-				compatible = "ai,audioinjector-isolated-soundcard";
-				//mute-gpios = <&gpio 17 0>;
-				mute-gpios = <&gpio3 RK_PC4 GPIO_ACTIVE_HIGH>;
-				i2s-controller = <&i2s3_2ch>;
-				codec = <&cs4272>;
-				status = "okay";
-			};
-		};
+&{/} {
+	sound {
+		compatible = "ai,audioinjector-isolated-soundcard";
+		//mute-gpios = <&gpio 17 0>;
+		mute-gpios = <&gpio3 RK_PC4 GPIO_ACTIVE_HIGH>;
+		i2s-controller = <&i2s3_2ch>;
+		codec = <&cs4272>;
+		status = "okay";
 	};
 };

arch/arm64/boot/dts/rockchip/overlays/radxa-5inch-touchscreen-on-cm3-sodimm-io.dts

@@ -10,137 +10,97 @@
 		exclusive = "dsi0";
 		description = "Enable Radxa 5-inch Touchscreen.";
 	};
+};
 
-	fragment@0 {
-		target = <&video_phy0>;
+&video_phy0 {
+	status = "okay";
+};
 
-		__overlay__ {
-			status = "okay";
-		};
-	};
+&dsi0 {
+	status = "okay";
+	#address-cells = <1>;
+	#size-cells = <0>;
 
-	fragment@1 {
-		target = <&dsi0>;
+	dsi0_panel: dsi-panel@0 {
+		compatible = "raspits,tc358762";
+		reg = <0x0>;
+		status = "okay";
 
-		__overlay__ {
-			status = "okay";
+		ports {
 			#address-cells = <1>;
 			#size-cells = <0>;
 
-			dsi0_panel: dsi-panel@0 {
-				compatible = "raspits,tc358762";
-				reg = <0x0>;
-				status = "okay";
-
-				ports {
-					#address-cells = <1>;
-					#size-cells = <0>;
-
-					port@0 {
-						reg = <0>;
-
-						panel_in_dsi0: endpoint {
-							remote-endpoint = <&dsi0_out_panel>;
-						};
-					};
-				};
-			};
-
-			ports {
-				#address-cells = <1>;
-				#size-cells = <0>;
-
-				port@1 {
-					reg = <1>;
-					#address-cells = <1>;
-					#size-cells = <0>;
+			port@0 {
+				reg = <0>;
 
-					dsi0_out_panel: endpoint@0 {
-						reg = <0>;
-						remote-endpoint = <&panel_in_dsi0>;
-					};
+				panel_in_dsi0: endpoint {
+					remote-endpoint = <&dsi0_out_panel>;
 				};
 			};
 		};
 	};
 
-	fragment@2 {
-		target = <&dsi0_panel>;
+	ports {
+		#address-cells = <1>;
+		#size-cells = <0>;
 
-		__overlay__ {
-			status = "okay";
-		};
-	};
-
-	fragment@3 {
-		target = <&dsi0_in_vp0>;
-
-		__overlay__ {
-			status = "okay";
-		};
-	};
-
-	fragment@4 {
-		target = <&dsi0_in_vp1>;
-
-		__overlay__ {
-			status = "disabled";
-		};
-	};
-
-	fragment@5 {
-		target = <&route_dsi0>;
-
-		__overlay__ {
-			status = "disabled";
-		};
-	};
-
-	fragment@6 {
-		target = <&i2c2>;
-
-		__overlay__ {
-			status = "okay";
-			pinctrl-0 = <&i2c2m1_xfer>;
+		port@1 {
+			reg = <1>;
 			#address-cells = <1>;
 			#size-cells = <0>;
 
-			rockpi_ft5406: rockpi_ft5406@38 {
-				compatible = "rockpi_ft5406";
-				reg = <0x38>;
-				status = "okay";
-			};
-
-			rockpi_mcu: rockpi-mcu@45 {
-				compatible = "rockpi_mcu";
-				reg = <0x45>;
-				status = "okay";
+			dsi0_out_panel: endpoint@0 {
+				reg = <0>;
+				remote-endpoint = <&panel_in_dsi0>;
 			};
 		};
 	};
-
-	fragment@7 {
-		target = <&vp0>;
-
-		__overlay__ {
-			rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER0 | 1 << ROCKCHIP_VOP2_ESMART0 | 1 << ROCKCHIP_VOP2_SMART0)>;
-			rockchip,primary-plane = <ROCKCHIP_VOP2_SMART0>;
-		};
+};
+
+&dsi0_panel {
+	status = "okay";
+};
+
+&dsi0_in_vp0 {
+	status = "okay";
+};
+
+&dsi0_in_vp1 {
+	status = "disabled";
+};
+
+&route_dsi0 {
+	status = "disabled";
+};
+
+&i2c2 {
+	status = "okay";
+	pinctrl-0 = <&i2c2m1_xfer>;
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	rockpi_ft5406: rockpi_ft5406@38 {
+		compatible = "rockpi_ft5406";
+		reg = <0x38>;
+		status = "okay";
 	};
 
-	fragment@8 {
-		target = <&hdmi>;
-
-		__overlay__ {
-			status = "disabled";
-		};
+	rockpi_mcu: rockpi-mcu@45 {
+		compatible = "rockpi_mcu";
+		reg = <0x45>;
+		status = "okay";
 	};
+};
 
-	fragment@9 {
-		target = <&hdmi_in_vp0>;
+&vp0 {
+	rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER0 | 1 << ROCKCHIP_VOP2_ESMART0 | 1 << ROCKCHIP_VOP2_SMART0)>;
+	rockchip,primary-plane = <ROCKCHIP_VOP2_SMART0>;
+};
 
-		__overlay__ {
-			status = "disabled";
-		};
-	};
-};
+&hdmi {
+	status = "disabled";
+};
+
+&hdmi_in_vp0 {
+	status = "disabled";
+};