Skip to content

Commit d1d348e

Browse files
committed
refactor: ZERO series overlays are replaced with reference syntax
1 parent 6e46ebb commit d1d348e

10 files changed

+238
-359
lines changed

arch/arm64/boot/dts/amlogic/overlays/radxa-zero-enable-vddio_c.dts

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,8 @@
1414
exclusive = "vddio_c";
1515
description = "Enable 1.8V signaling for data microSD.\nThis will make reboot fail if booting from microSD.";
1616
};
17+
};
1718

18-
fragment@2 {
19-
target = <&vddio_c>;
20-
__overlay__ {
21-
gpios = <&gpio_ao GPIOAO_7 GPIO_ACTIVE_HIGH>;
22-
};
23-
};
24-
};
19+
&vddio_c {
20+
gpios = <&gpio_ao GPIOAO_7 GPIO_ACTIVE_HIGH>;
21+
};
Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
/ {
2-
fragment@0 {
3-
target = <&led_power_151>;
4-
__overlay__ {
5-
status = "disabled";
6-
};
7-
};
1+
&led_power_151 {
2+
status = "disabled";
83
};

arch/arm64/boot/dts/amlogic/overlays/radxa-zero-led-8-off.dts

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,8 @@
99
exclusive = "led_power";
1010
description = "Enable GPIOAO_8 for hardware version 1.51 and later.\nThis is due to older version uses this for Power LED.";
1111
};
12+
};
1213

13-
fragment@0 {
14-
target = <&led_power>;
15-
__overlay__ {
16-
status = "disabled";
17-
};
18-
};
19-
};
14+
&led_power {
15+
status = "disabled";
16+
};

arch/arm64/boot/dts/amlogic/overlays/radxa-zero2-enable-vddio_c.dts

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,8 @@
1414
exclusive = "vddio_c";
1515
description = "Enable 1.8V signaling for data microSD.\nThis will make reboot fail if booting from microSD.";
1616
};
17+
};
1718

18-
fragment@2 {
19-
target = <&vddio_c>;
20-
__overlay__ {
21-
gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_HIGH>;
22-
};
23-
};
24-
};
19+
&vddio_c {
20+
gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_HIGH>;
21+
};

arch/arm64/boot/dts/amlogic/overlays/radxa-zero2-radxa-25w-poe.dts

Lines changed: 31 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -15,56 +15,45 @@
1515
exclusive = "i2c0", "GPIOAO_8", "GPIOZ_2", "GPIOZ_0", "GPIOZ_1";
1616
package = "rsetup-config-thermal-governor-step-wise";
1717
};
18+
};
1819

19-
fragment@0 {
20-
target-path = "/";
21-
__overlay__ {
22-
radxa_pow_w1: radxa-poe-w1 {
23-
compatible = "w1-gpio";
24-
gpios = <&gpio GPIOZ_2 GPIO_ACTIVE_HIGH>;
25-
status = "okay";
26-
};
27-
28-
radxa_poe_pwm: radxa-poe-pwm {
29-
compatible = "pwm-gpio";
30-
#pwm-cells = <3>;
31-
pwm-gpio = <&gpio_ao GPIOAO_8 GPIO_ACTIVE_HIGH>;
32-
};
20+
&{/} {
21+
radxa_pow_w1: radxa-poe-w1 {
22+
compatible = "w1-gpio";
23+
gpios = <&gpio GPIOZ_2 GPIO_ACTIVE_HIGH>;
24+
status = "okay";
25+
};
3326

34-
radxa_poe_fan: radxa-poe-fan {
35-
compatible = "pwm-fan";
36-
#cooling-cells = <2>;
37-
cooling-min-state = <0>;
38-
cooling-max-state = <4>;
39-
cooling-levels = <0 64 128 192 255>;
40-
pwms = <&radxa_poe_pwm 0 40000 PWM_POLARITY_INVERTED>;
41-
};
42-
};
27+
radxa_poe_pwm: radxa-poe-pwm {
28+
compatible = "pwm-gpio";
29+
#pwm-cells = <3>;
30+
pwm-gpio = <&gpio_ao GPIOAO_8 GPIO_ACTIVE_HIGH>;
4331
};
4432

45-
fragment@1 {
46-
target = <&cpu_thermal>;
33+
radxa_poe_fan: radxa-poe-fan {
34+
compatible = "pwm-fan";
35+
#cooling-cells = <2>;
36+
cooling-min-state = <0>;
37+
cooling-max-state = <4>;
38+
cooling-levels = <0 64 128 192 255>;
39+
pwms = <&radxa_poe_pwm 0 40000 PWM_POLARITY_INVERTED>;
40+
};
41+
};
4742

48-
__overlay__ {
49-
cooling-maps {
50-
map2 {
51-
cooling-device = <&fan0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
52-
<&radxa_poe_fan THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
53-
};
54-
};
43+
&cpu_thermal {
44+
cooling-maps {
45+
map2 {
46+
cooling-device = <&fan0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
47+
<&radxa_poe_fan THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
5548
};
5649
};
50+
};
5751

58-
fragment@2 {
59-
target = <&ddr_thermal>;
60-
61-
__overlay__ {
62-
cooling-maps {
63-
map2 {
64-
cooling-device = <&fan0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
65-
<&radxa_poe_fan THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
66-
};
67-
};
52+
&ddr_thermal {
53+
cooling-maps {
54+
map2 {
55+
cooling-device = <&fan0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
56+
<&radxa_poe_fan THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
6857
};
6958
};
7059
};

arch/arm64/boot/dts/rockchip/overlays/radxa-zero3-disabled-ethernet.dts

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,12 @@
1212
category = "misc";
1313
description = "Disabled Zero 3W Ethernet.";
1414
};
15+
};
1516

16-
fragment@0 {
17-
target = <&mdio1>;
18-
19-
__overlay__ {
20-
status = "disabled";
21-
};
22-
};
23-
24-
fragment@1 {
25-
target = <&gmac1>;
17+
&mdio1 {
18+
status = "disabled";
19+
};
2620

27-
__overlay__ {
28-
status = "disabled";
29-
};
30-
};
21+
&gmac1 {
22+
status = "disabled";
3123
};

arch/arm64/boot/dts/rockchip/overlays/radxa-zero3-disabled-wireless.dts

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,12 @@
1212
category = "misc";
1313
description = "Disabled Zero 3E Wireless.";
1414
};
15+
};
1516

16-
fragment@0 {
17-
target = <&uart1>;
18-
19-
__overlay__ {
20-
status = "disabled";
21-
};
22-
};
23-
24-
fragment@1 {
25-
target = <&sdmmc1>;
17+
&uart1 {
18+
status = "disabled";
19+
};
2620

27-
__overlay__ {
28-
status = "disabled";
29-
};
30-
};
21+
&sdmmc1 {
22+
status = "disabled";
3123
};

arch/arm64/boot/dts/rockchip/overlays/radxa-zero3-external-antenna.dts

Lines changed: 17 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -13,34 +13,26 @@
1313
exclusive = "GPIO3_D2";
1414
description = "Enable external antenna.";
1515
};
16+
};
1617

17-
fragment@0 {
18-
target-path = "/";
19-
20-
__overlay__ {
21-
board_antenna: board-antenna {
22-
status = "okay";
23-
compatible = "regulator-fixed";
24-
enable-active-low;
25-
gpio = <&gpio3 RK_PD2 GPIO_ACTIVE_LOW>;
26-
regulator-always-on;
27-
regulator-boot-on;
28-
pinctrl-0 = <&ant_1>;
29-
pinctrl-names = "default";
30-
regulator-name = "board_antenna";
31-
};
32-
};
18+
&{/} {
19+
board_antenna: board-antenna {
20+
status = "okay";
21+
compatible = "regulator-fixed";
22+
enable-active-low;
23+
gpio = <&gpio3 RK_PD2 GPIO_ACTIVE_LOW>;
24+
regulator-always-on;
25+
regulator-boot-on;
26+
pinctrl-0 = <&ant_1>;
27+
pinctrl-names = "default";
28+
regulator-name = "board_antenna";
3329
};
30+
};
3431

35-
fragment@1 {
36-
target = <&pinctrl>;
37-
38-
__overlay__ {
39-
antenna {
40-
ant_1: ant-1 {
41-
rockchip,pins = <3 RK_PD2 RK_FUNC_GPIO &pcfg_pull_down>;
42-
};
43-
};
32+
&pinctrl {
33+
antenna {
34+
ant_1: ant-1 {
35+
rockchip,pins = <3 RK_PD2 RK_FUNC_GPIO &pcfg_pull_down>;
4436
};
4537
};
4638
};

0 commit comments

Comments
 (0)