refactor: ROCK series overlays are replaced with reference syntax

CodeChenL · Apr 11, 2024 · 8b91e6b · 8b91e6b
1 parent 2f9c95a
commit 8b91e6b
Show file tree

Hide file tree

Showing 93 changed files with 9,625 additions and 12,712 deletions.
diff --git a/arch/arm64/boot/dts/rockchip/overlays/radxa-s0-ext-antenna.dts b/arch/arm64/boot/dts/rockchip/overlays/radxa-s0-ext-antenna.dts
@@ -11,43 +11,30 @@
 		exclusive = "GPIO0_A6", "GPIO0_A5";
 		description = "Enable External Antenna.";
 	};
+};
 
-	fragment@0 {
-		target-path = "/";
-
-		__overlay__ {
-			ext_antenna: ext-antenna {
-				status = "okay";
-				compatible = "regulator-fixed";
-				enable-active-low;
-				gpio = <&gpio0 RK_PA6 GPIO_ACTIVE_LOW>;
-				regulator-always-on;
-				regulator-boot-on;
-				pinctrl-0 = <&ant_2>;
-				pinctrl-names = "default";
-				regulator-name = "ext_antenna";
-			};
-		};
-	};
-
-	fragment@1 {
-		target = <&board_antenna>;
-
-		__overlay__ {
-			status = "disabled";
-		};
+&{/} {
+	ext_antenna: ext-antenna {
+		status = "okay";
+		compatible = "regulator-fixed";
+		enable-active-low;
+		gpio = <&gpio0 RK_PA6 GPIO_ACTIVE_LOW>;
+		regulator-always-on;
+		regulator-boot-on;
+		pinctrl-0 = <&ant_2>;
+		pinctrl-names = "default";
+		regulator-name = "ext_antenna";
 	};
+};
 
-	fragment@2 {
-		target = <&pinctrl>;
+&board_antenna {
+	status = "disabled";
+};
 
-		__overlay__ {
-			antenna {
-				ant_2: ant-2 {
-					rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_down>;
-				};
-			};
+&pinctrl {
+	antenna {
+		ant_2: ant-2 {
+			rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 	};
 };
-
diff --git a/arch/arm64/boot/dts/rockchip/overlays/rock-3-ov5647.dtsi b/arch/arm64/boot/dts/rockchip/overlays/rock-3-ov5647.dtsi
@@ -1,89 +1,43 @@
-/ {
-	fragment@0 {
-		target = <&ext_cam_clk>;
-
-		__overlay__ {
-			status = "okay";
-		};
-	};
-
-	fragment@1 {
-		target = <&i2c5>;
-
-		__overlay__ {
-			status = "okay";
-		};
-	};
-
-	fragment@2 {
-		target = <&ov5647>;
-
-		__overlay__ {
-			status = "okay";
-		};
-	};
-
-	fragment@3 {
-		target = <&csi2_dphy_hw>;
-
-		__overlay__ {
-			status = "okay";
-		};
-	};
-
-	fragment@4 {
-		target = <&csi2_dphy0>;
-
-		__overlay__ {
-			status = "okay";
-		};
-	};
-
-	fragment@5 {
-		target = <&rkisp_vir0>;
-
-		__overlay__ {
-			status = "okay";
-		};
-	};
+&ext_cam_clk {
+	status = "okay";
+};
 
-	fragment@6 {
-		target = <&rkisp>;
+&i2c5 {
+	status = "okay";
+};
 
-		__overlay__ {
-			status = "okay";
-		};
-	};
+&ov5647 {
+	status = "okay";
+};
 
-	fragment@7 {
-		target = <&rkisp_mmu>;
+&csi2_dphy_hw {
+	status = "okay";
+};
 
-		__overlay__ {
-			status = "okay";
-		};
-	};
+&csi2_dphy0 {
+	status = "okay";
+};
 
-	fragment@8 {
-		target = <&rkcif_mmu>;
+&rkisp_vir0 {
+	status = "okay";
+};
 
-		__overlay__ {
-			status = "okay";
-		};
-	};
+&rkisp{
+	status = "okay";
+};
 
-	fragment@9 {
-		target = <&rkcif>;
+&rkisp_mmu {
+	status = "okay";
+};
 
-		__overlay__ {
-			status = "okay";
-		};
-	};
+&rkcif_mmu {
+	status = "okay";
+};
 
-	fragment@10 {
-		target = <&vcc_camera>;
+&rkcif {
+	status = "okay";
+};
 
-		__overlay__ {
-			status = "okay";
-		};
-	};
+&vcc_camera {
+	status = "okay";
 };
diff --git a/arch/arm64/boot/dts/rockchip/overlays/rock-3a-radxa-25w-poe.dts b/arch/arm64/boot/dts/rockchip/overlays/rock-3a-radxa-25w-poe.dts
@@ -15,47 +15,40 @@
 		exclusive = "GPIO0_B5", "GPIO3_C3";
 		package = "rsetup-config-thermal-governor-step-wise";
 	};
+};
 
-	fragment@0 {
-		target-path = "/";
-		__overlay__ {
-			radxa_pow_w1: radxa-poe-w1 {
-				compatible = "w1-gpio";
-				gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>;
-				status = "okay";
-			};
-
-			radxa_poe_pwm: radxa-poe-pwm {
-				compatible = "pwm-gpio";
-				#pwm-cells = <3>;
-				pwm-gpio = <&gpio3 RK_PC3 GPIO_ACTIVE_HIGH>;
-			};
+&{/} {
+	radxa_pow_w1: radxa-poe-w1 {
+		compatible = "w1-gpio";
+		gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>;
+		status = "okay";
+	};
 
-			radxa_poe_fan: radxa-poe-fan {
-				compatible = "pwm-fan";
-				#cooling-cells = <2>;
-				cooling-min-state = <0>;
-				cooling-max-state = <4>;
-				cooling-levels = <0 64 128 192 255>;
-				pwms = <&radxa_poe_pwm 0 40000 PWM_POLARITY_INVERTED>;
-			};
-		};
+	radxa_poe_pwm: radxa-poe-pwm {
+		compatible = "pwm-gpio";
+		#pwm-cells = <3>;
+		pwm-gpio = <&gpio3 RK_PC3 GPIO_ACTIVE_HIGH>;
 	};
 
-	fragment@1 {
-		target = <&soc_thermal>;
+	radxa_poe_fan: radxa-poe-fan {
+		compatible = "pwm-fan";
+		#cooling-cells = <2>;
+		cooling-min-state = <0>;
+		cooling-max-state = <4>;
+		cooling-levels = <0 64 128 192 255>;
+		pwms = <&radxa_poe_pwm 0 40000 PWM_POLARITY_INVERTED>;
+	};
+};
 
-		__overlay__ {
-			cooling-maps {
-				map3 {
-					cooling-device = <&fan0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-									 <&radxa_poe_fan THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-				};
-				map4 {
-					cooling-device = <&fan0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-									 <&radxa_poe_fan THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-				};
-			};
+&soc_thermal {
+	cooling-maps {
+		map3 {
+			cooling-device = <&fan0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+								<&radxa_poe_fan THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+		};
+		map4 {
+			cooling-device = <&fan0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+								<&radxa_poe_fan THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
 		};
 	};
 };