refactor: all amlogic overlays are replaced with reference syntax

CodeChenL · Apr 12, 2024 · 6e46ebb · 6e46ebb
1 parent 9ca2252
commit 6e46ebb
Show file tree

Hide file tree

Showing 37 changed files with 396 additions and 571 deletions.
diff --git a/arch/arm64/boot/dts/amlogic/overlays/meson-g12-disable-gpu.dts b/arch/arm64/boot/dts/amlogic/overlays/meson-g12-disable-gpu.dts
@@ -9,12 +9,8 @@
 		exclusive = "gpu";
 		description = "Disable GPU.";
 	};
+};
 
-	fragment@0 {
-		target = <&mali>;
-
-		__overlay__ {
-			status = "disabled";
-		};
-	};
+&mali {
+	status = "disabled";
 };
diff --git a/arch/arm64/boot/dts/amlogic/overlays/meson-g12-disable-hdmi.dts b/arch/arm64/boot/dts/amlogic/overlays/meson-g12-disable-hdmi.dts
@@ -9,28 +9,16 @@
 		exclusive = "hdmi";
 		description = "Disable HDMI.";
 	};
+};
 
-	fragment@0 {
-		target = <&hdmi_tx>;
-
-		__overlay__ {
-			status = "disabled";
-		};
-	};
-
-	fragment@1 {
-		target = <&cecb_AO>;
-
-		__overlay__ {
-			status = "disabled";
-		};
-	};
+&hdmi_tx {
+	status = "disabled";
+};
 
-	fragment@2 {
-		target = <&cec_AO>;
+&cecb_AO {
+	status = "disabled";
+};
 
-		__overlay__ {
-			status = "disabled";
-		};
-	};
+&cec_AO {
+	status = "disabled";
 };
diff --git a/arch/arm64/boot/dts/amlogic/overlays/meson-g12-disable-usb.dts b/arch/arm64/boot/dts/amlogic/overlays/meson-g12-disable-usb.dts
@@ -9,28 +9,16 @@
 		exclusive = "usb";
 		description = "Disable USB.";
 	};
+};
 
-	fragment@0 {
-		target = <&usb>;
-
-		__overlay__ {
-			status = "disabled";
-		};
-	};
-
-	fragment@1 {
-		target = <&usb2_phy0>;
-
-		__overlay__ {
-			status = "disabled";
-		};
-	};
+&usb {
+	status = "disabled";
+};
 
-	fragment@2 {
-		target = <&usb2_phy0>;
+&usb2_phy0 {
+	status = "disabled";
+};
 
-		__overlay__ {
-			status = "disabled";
-		};
-	};
+&usb2_phy0 {
+	status = "disabled";
 };
diff --git a/arch/arm64/boot/dts/amlogic/overlays/meson-g12-gpio-poweroff.dts b/arch/arm64/boot/dts/amlogic/overlays/meson-g12-gpio-poweroff.dts
@@ -12,16 +12,13 @@
 		exclusive = "GPIOAO_9";
 		description = "Enable gpio-poweroff on GPIOAO_9,";
 	};
+};
 
-	fragment@0 {
-		target-path = "/";
-		__overlay__ {
-			gpio-poweroff {
-				compatible = "gpio-poweroff";
-				gpios = <&gpio_ao GPIOAO_9 GPIO_ACTIVE_LOW>;
-				timeout-ms = <20000>;
-				force;
-			};
-		};
+&{/} {
+	gpio-poweroff {
+		compatible = "gpio-poweroff";
+		gpios = <&gpio_ao GPIOAO_9 GPIO_ACTIVE_LOW>;
+		timeout-ms = <20000>;
+		force;
 	};
 };
diff --git a/arch/arm64/boot/dts/amlogic/overlays/meson-g12-i2c-ao-m0.dts b/arch/arm64/boot/dts/amlogic/overlays/meson-g12-i2c-ao-m0.dts
@@ -9,13 +9,10 @@
 		exclusive = "i2c_AO", "GPIOAO_2", "GPIOAO_3";
 		description = "Enable I2C_AO-M0 on GPIOAO_2 and GPIOAO_3.";
 	};
+};
 
-	fragment@0 {
-		target = <&i2c_AO>;
-		__overlay__ {
-			status = "okay";
-			pinctrl-0 = <&i2c_ao_sck_pins &i2c_ao_sda_pins>;
-			pinctrl-names = "default";
-		};
-	};
+&i2c_AO {
+	status = "okay";
+	pinctrl-0 = <&i2c_ao_sck_pins &i2c_ao_sda_pins>;
+	pinctrl-names = "default";
 };
diff --git a/arch/arm64/boot/dts/amlogic/overlays/meson-g12-i2c-ee-m0-01.dts b/arch/arm64/boot/dts/amlogic/overlays/meson-g12-i2c-ee-m0-01.dts
@@ -9,13 +9,10 @@
 		exclusive = "i2c0", "GPIOZ_0", "GPIOZ_1";
 		description = "Enable I2C_EE-M0 on GPIOZ_0 and GPIOZ_1.";
 	};
+};
 
-	fragment@0 {
-		target = <&i2c0>;
-		__overlay__ {
-			status = "okay";
-			pinctrl-0 = <&i2c0_sck_z1_pins &i2c0_sda_z0_pins>;
-			pinctrl-names = "default";
-		};
-	};
-};
+&i2c0 {
+	status = "okay";
+	pinctrl-0 = <&i2c0_sck_z1_pins &i2c0_sda_z0_pins>;
+	pinctrl-names = "default";
+};
diff --git a/arch/arm64/boot/dts/amlogic/overlays/meson-g12-i2c-ee-m0-17.dts b/arch/arm64/boot/dts/amlogic/overlays/meson-g12-i2c-ee-m0-17.dts
@@ -9,13 +9,10 @@
 		exclusive = "i2c0", "GPIOZ_1", "GPIOZ_7";
 		description = "Enable I2C_EE-M0 on GPIOZ_1 and GPIOZ_7.";
 	};
+};
 
-	fragment@0 {
-		target = <&i2c0>;
-		__overlay__ {
-			status = "okay";
-			pinctrl-0 = <&i2c0_sck_z1_pins &i2c0_sda_z7_pins>;
-			pinctrl-names = "default";
-		};
-	};
-};
+&i2c0 {
+	status = "okay";
+	pinctrl-0 = <&i2c0_sck_z1_pins &i2c0_sda_z7_pins>;
+	pinctrl-names = "default";
+};
diff --git a/arch/arm64/boot/dts/amlogic/overlays/meson-g12-i2c-ee-m1-h.dts b/arch/arm64/boot/dts/amlogic/overlays/meson-g12-i2c-ee-m1-h.dts
@@ -9,13 +9,10 @@
 		exclusive = "i2c1", "GPIOH_6", "GPIOH_7";
 		description = "Enable I2C_EE-M1 on GPIOH_6 and GPIOH_7.";
 	};
+};
 
-	fragment@0 {
-		target = <&i2c1>;
-		__overlay__ {
-			status = "okay";
-			pinctrl-0 = <&i2c1_sck_h7_pins &i2c1_sda_h6_pins>;
-			pinctrl-names = "default";
-		};
-	};
+&i2c1 {
+	status = "okay";
+	pinctrl-0 = <&i2c1_sck_h7_pins &i2c1_sda_h6_pins>;
+	pinctrl-names = "default";
 };
diff --git a/arch/arm64/boot/dts/amlogic/overlays/meson-g12-i2c-ee-m1-x.dts b/arch/arm64/boot/dts/amlogic/overlays/meson-g12-i2c-ee-m1-x.dts
@@ -9,13 +9,10 @@
 		exclusive = "i2c1", "GPIOX_10", "GPIOX_11";
 		description = "Enable I2C_EE-M1 on GPIOX_10 and GPIOX_11.";
 	};
+};
 
-	fragment@0 {
-		target = <&i2c1>;
-		__overlay__ {
-			status = "okay";
-			pinctrl-0 = <&i2c1_sck_x_pins &i2c1_sda_x_pins>;
-			pinctrl-names = "default";
-		};
-	};
+&i2c1 {
+	status = "okay";
+	pinctrl-0 = <&i2c1_sck_x_pins &i2c1_sda_x_pins>;
+	pinctrl-names = "default";
 };
diff --git a/arch/arm64/boot/dts/amlogic/overlays/meson-g12-i2c-ee-m3-a-ds3231.dts b/arch/arm64/boot/dts/amlogic/overlays/meson-g12-i2c-ee-m3-a-ds3231.dts
@@ -13,35 +13,29 @@
 		exclusive = "GPIOAO_3";
 		description = "Enable DS3231 RTC on I2C_EE-M3.\nINT = GPIOAO_3";
 	};
+};
 
-	fragment@0 {
-		target = <&i2c3>;
-		__overlay__ {
-			status = "okay";
-			pinctrl-0 = <&i2c3_sck_a_pins &i2c3_sda_a_pins>;
-			pinctrl-names = "default";
+&i2c3 {
+	status = "okay";
+	pinctrl-0 = <&i2c3_sck_a_pins &i2c3_sda_a_pins>;
+	pinctrl-names = "default";
 
-			ds3231: ds3231@68 {
-				compatible = "maxim,ds3231";
-				reg = <0x68>;
-				#clock-cells = <1>;
-				interrupt-parent = <&gpio_intc>;
-				interrupts = <3 IRQ_TYPE_EDGE_FALLING>;
-			};
-		};
+	ds3231: ds3231@68 {
+		compatible = "maxim,ds3231";
+		reg = <0x68>;
+		#clock-cells = <1>;
+		interrupt-parent = <&gpio_intc>;
+		interrupts = <3 IRQ_TYPE_EDGE_FALLING>;
 	};
+};
 
-	fragment@1 {
-		target = <&ao_pinctrl>;
-		__overlay__ {
-			ds3231_int_pins: ds3231-int-pins@0 {
-				mux {
-					groups = "GPIOAO_3";
-					function = "gpio_aobus";
-					bias-pull-up;
-					drive-strength-microamp = <4000>;
-				};
-			};
+&ao_pinctrl {
+	ds3231_int_pins: ds3231-int-pins@0 {
+		mux {
+			groups = "GPIOAO_3";
+			function = "gpio_aobus";
+			bias-pull-up;
+			drive-strength-microamp = <4000>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/amlogic/overlays/meson-g12-i2c-ee-m3-a.dts b/arch/arm64/boot/dts/amlogic/overlays/meson-g12-i2c-ee-m3-a.dts
@@ -9,13 +9,10 @@
 		exclusive = "i2c3", "GPIOA_14", "GPIOA_15";
 		description = "Enable I2C_EE-M3 on GPIOA_14 and GPIOA_15.";
 	};
+};
 
-	fragment@0 {
-		target = <&i2c3>;
-		__overlay__ {
-			status = "okay";
-			pinctrl-0 = <&i2c3_sck_a_pins &i2c3_sda_a_pins>;
-			pinctrl-names = "default";
-		};
-	};
+&i2c3 {
+	status = "okay";
+	pinctrl-0 = <&i2c3_sck_a_pins &i2c3_sda_a_pins>;
+	pinctrl-names = "default";
 };
diff --git a/arch/arm64/boot/dts/amlogic/overlays/meson-g12-pwm-b-h.dts b/arch/arm64/boot/dts/amlogic/overlays/meson-g12-pwm-b-h.dts
@@ -9,15 +9,12 @@
 		exclusive = "pwm_ab", "GPIOH_7";
 		description = "Enable PWM-B on GPIOH_7.";
 	};
+};
 
-	fragment@0 {
-		target = <&pwm_ab>;
-		__overlay__ {
-			pinctrl-0 = <&pwm_a_e_pins &pwm_b_h_pins>;
-			pinctrl-names = "default";
-			clocks = <&xtal>;
-			clock-names = "clkin0";
-			status = "okay";
-		};
-	};
-};
+&pwm_ab {
+	pinctrl-0 = <&pwm_a_e_pins &pwm_b_h_pins>;
+	pinctrl-names = "default";
+	clocks = <&xtal>;
+	clock-names = "clkin0";
+	status = "okay";
+};
diff --git a/arch/arm64/boot/dts/amlogic/overlays/meson-g12-pwm-b-z.dts b/arch/arm64/boot/dts/amlogic/overlays/meson-g12-pwm-b-z.dts
@@ -9,15 +9,12 @@
 		exclusive = "pwm_ab", "GPIOZ_0";
 		description = "Enable PWM-B on GPIOZ_0.";
 	};
+};
 
-	fragment@0 {
-		target = <&pwm_ab>;
-		__overlay__ {
-			pinctrl-0 = <&pwm_a_e_pins &pwm_b_z_pins>;
-			pinctrl-names = "default";
-			clocks = <&xtal>;
-			clock-names = "clkin0";
-			status = "okay";
-		};
-	};
-};
+&pwm_ab {
+	pinctrl-0 = <&pwm_a_e_pins &pwm_b_z_pins>;
+	pinctrl-names = "default";
+	clocks = <&xtal>;
+	clock-names = "clkin0";
+	status = "okay";
+};
diff --git a/arch/arm64/boot/dts/amlogic/overlays/meson-g12-pwm-c-x.dts b/arch/arm64/boot/dts/amlogic/overlays/meson-g12-pwm-c-x.dts
@@ -9,15 +9,12 @@
 		exclusive = "pwm_cd", "GPIOX_8";
 		description = "Enable PWM-C on GPIOX_8.";
 	};
+};
 
-	fragment@0 {
-		target = <&pwm_cd>;
-		__overlay__ {
-			status = "okay";
-			pinctrl-0 = <&pwm_c_x8_pins>;
-			pinctrl-names = "default";
-			clocks = <&xtal>;
-			clock-names = "clkin2";
-		};
-	};
+&pwm_cd {
+	status = "okay";
+	pinctrl-0 = <&pwm_c_x8_pins>;
+	pinctrl-names = "default";
+	clocks = <&xtal>;
+	clock-names = "clkin2";
 };
diff --git a/arch/arm64/boot/dts/amlogic/overlays/meson-g12-pwm-c-z.dts b/arch/arm64/boot/dts/amlogic/overlays/meson-g12-pwm-c-z.dts
@@ -9,15 +9,12 @@
 		exclusive = "pwm_cd", "GPIOZ_1";
 		description = "Enable PWM-C on GPIOZ_1.";
 	};
+};
 
-	fragment@0 {
-		target = <&pwm_cd>;
-		__overlay__ {
-			pinctrl-0 = <&pwm_c_z_pins>;
-			pinctrl-names = "default";
-			clocks = <&xtal>;
-			clock-names = "clkin1";
-			status = "okay";
-		};
-	};
-};
+&pwm_cd {
+	pinctrl-0 = <&pwm_c_z_pins>;
+	pinctrl-names = "default";
+	clocks = <&xtal>;
+	clock-names = "clkin1";
+	status = "okay";
+};