Skip to content

Commit 838e204

Browse files
CodeChenLCodeChenL
committed
refactor: ROCK series overlays are replaced with reference syntax
1 parent 9ca2252 commit 838e204

File tree

93 files changed

+9624
-12710
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+9624
-12710
lines changed

‎arch/arm64/boot/dts/rockchip/overlays/radxa-s0-ext-antenna.dts‎

Lines changed: 20 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -11,43 +11,30 @@
1111
exclusive = "GPIO0_A6", "GPIO0_A5";
1212
description = "Enable External Antenna.";
1313
};
14+
};
1415

15-
fragment@0 {
16-
target-path = "/";
17-
18-
__overlay__ {
19-
ext_antenna: ext-antenna {
20-
status = "okay";
21-
compatible = "regulator-fixed";
22-
enable-active-low;
23-
gpio = <&gpio0 RK_PA6 GPIO_ACTIVE_LOW>;
24-
regulator-always-on;
25-
regulator-boot-on;
26-
pinctrl-0 = <&ant_2>;
27-
pinctrl-names = "default";
28-
regulator-name = "ext_antenna";
29-
};
30-
};
31-
};
32-
33-
fragment@1 {
34-
target = <&board_antenna>;
35-
36-
__overlay__ {
37-
status = "disabled";
38-
};
16+
&{/} {
17+
ext_antenna: ext-antenna {
18+
status = "okay";
19+
compatible = "regulator-fixed";
20+
enable-active-low;
21+
gpio = <&gpio0 RK_PA6 GPIO_ACTIVE_LOW>;
22+
regulator-always-on;
23+
regulator-boot-on;
24+
pinctrl-0 = <&ant_2>;
25+
pinctrl-names = "default";
26+
regulator-name = "ext_antenna";
3927
};
28+
};
4029

41-
fragment@2 {
42-
target = <&pinctrl>;
30+
&board_antenna {
31+
status = "disabled";
32+
};
4333

44-
__overlay__ {
45-
antenna {
46-
ant_2: ant-2 {
47-
rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_down>;
48-
};
49-
};
34+
&pinctrl {
35+
antenna {
36+
ant_2: ant-2 {
37+
rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_down>;
5038
};
5139
};
5240
};
53-

‎arch/arm64/boot/dts/rockchip/overlays/rock-3-ov5647.dtsi‎

Lines changed: 32 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -1,89 +1,43 @@
1-
/ {
2-
fragment@0 {
3-
target = <&ext_cam_clk>;
4-
5-
__overlay__ {
6-
status = "okay";
7-
};
8-
};
9-
10-
fragment@1 {
11-
target = <&i2c5>;
12-
13-
__overlay__ {
14-
status = "okay";
15-
};
16-
};
17-
18-
fragment@2 {
19-
target = <&ov5647>;
20-
21-
__overlay__ {
22-
status = "okay";
23-
};
24-
};
25-
26-
fragment@3 {
27-
target = <&csi2_dphy_hw>;
28-
29-
__overlay__ {
30-
status = "okay";
31-
};
32-
};
33-
34-
fragment@4 {
35-
target = <&csi2_dphy0>;
36-
37-
__overlay__ {
38-
status = "okay";
39-
};
40-
};
41-
42-
fragment@5 {
43-
target = <&rkisp_vir0>;
44-
45-
__overlay__ {
46-
status = "okay";
47-
};
48-
};
1+
&ext_cam_clk {
2+
status = "okay";
3+
};
494

50-
fragment@6 {
51-
target = <&rkisp>;
5+
&i2c5 {
6+
status = "okay";
7+
};
528

53-
__overlay__ {
54-
status = "okay";
55-
};
56-
};
9+
&ov5647 {
10+
status = "okay";
11+
};
5712

58-
fragment@7 {
59-
target = <&rkisp_mmu>;
13+
&csi2_dphy_hw {
14+
status = "okay";
15+
};
6016

61-
__overlay__ {
62-
status = "okay";
63-
};
64-
};
17+
&csi2_dphy0 {
18+
status = "okay";
19+
};
6520

66-
fragment@8 {
67-
target = <&rkcif_mmu>;
21+
&rkisp_vir0 {
22+
status = "okay";
23+
};
6824

69-
__overlay__ {
70-
status = "okay";
71-
};
72-
};
25+
&rkisp{
26+
status = "okay";
27+
};
7328

74-
fragment@9 {
75-
target = <&rkcif>;
29+
&rkisp_mmu {
30+
status = "okay";
31+
};
7632

77-
__overlay__ {
78-
status = "okay";
79-
};
80-
};
33+
&rkcif_mmu {
34+
status = "okay";
35+
};
8136

82-
fragment@10 {
83-
target = <&vcc_camera>;
37+
&rkcif {
38+
status = "okay";
39+
};
8440

85-
__overlay__ {
86-
status = "okay";
87-
};
88-
};
41+
&vcc_camera {
42+
status = "okay";
8943
};

‎arch/arm64/boot/dts/rockchip/overlays/rock-3a-radxa-25w-poe.dts‎

Lines changed: 29 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -15,47 +15,40 @@
1515
exclusive = "GPIO0_B5", "GPIO3_C3";
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 = <&gpio0 RK_PB5 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 = <&gpio3 RK_PC3 GPIO_ACTIVE_HIGH>;
32-
};
20+
&{/} {
21+
radxa_pow_w1: radxa-poe-w1 {
22+
compatible = "w1-gpio";
23+
gpios = <&gpio0 RK_PB5 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 = <&gpio3 RK_PC3 GPIO_ACTIVE_HIGH>;
4331
};
4432

45-
fragment@1 {
46-
target = <&soc_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-
map3 {
51-
cooling-device = <&fan0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
52-
<&radxa_poe_fan THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
53-
};
54-
map4 {
55-
cooling-device = <&fan0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
56-
<&radxa_poe_fan THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
57-
};
58-
};
43+
&soc_thermal {
44+
cooling-maps {
45+
map3 {
46+
cooling-device = <&fan0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
47+
<&radxa_poe_fan THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
48+
};
49+
map4 {
50+
cooling-device = <&fan0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
51+
<&radxa_poe_fan THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
5952
};
6053
};
6154
};

0 commit comments

Comments
 (0)