Skip to content

Commit 978a5c5

Browse files
RadxaYuntianRadxaYuntian
authored
Merge pull request #294 from CodeChenL/main
refactor: ROCK series overlays are replaced with reference syntax
2 parents 41951a2 + 838e204 commit 978a5c5

File tree

92 files changed

+9604
-12677
lines changed

Some content is hidden

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

92 files changed

+9604
-12677
lines changed

‎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
};

‎arch/arm64/boot/dts/rockchip/overlays/rock-3a-radxa-5inch-touchscreen.dts‎

Lines changed: 59 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -12,120 +12,92 @@
1212
exclusive = "dsi1";
1313
description = "Enable Radxa 5-inch Touchscreen.";
1414
};
15+
};
1516

16-
fragment@0 {
17-
target-path = "/";
18-
19-
__overlay__ {
20-
vcc_mipi: vcc-mipi {
21-
status = "okay";
22-
compatible = "regulator-fixed";
23-
regulator-name = "vcc_mipi";
24-
regulator-boot-on;
25-
regulator-min-microvolt = <3000000>;
26-
regulator-max-microvolt = <3000000>;
27-
enable-active-high;
28-
regulator-always-on;
29-
gpio = <&gpio3 RK_PC0 GPIO_ACTIVE_HIGH>;
30-
};
31-
};
17+
&{/} {
18+
vcc_mipi: vcc-mipi {
19+
status = "okay";
20+
compatible = "regulator-fixed";
21+
regulator-name = "vcc_mipi";
22+
regulator-boot-on;
23+
regulator-min-microvolt = <3000000>;
24+
regulator-max-microvolt = <3000000>;
25+
enable-active-high;
26+
regulator-always-on;
27+
gpio = <&gpio3 RK_PC0 GPIO_ACTIVE_HIGH>;
3228
};
29+
};
3330

34-
fragment@1 {
35-
target = <&dsi1>;
31+
&dsi1 {
32+
status = "okay";
33+
#address-cells = <1>;
34+
#size-cells = <0>;
3635

37-
__overlay__ {
38-
status = "okay";
36+
dsi1_panel: dsi-panel@0 {
37+
compatible = "raspits,tc358762";
38+
reg = <0x0>;
39+
status = "okay";
40+
41+
ports {
3942
#address-cells = <1>;
4043
#size-cells = <0>;
4144

42-
dsi1_panel: dsi-panel@0 {
43-
compatible = "raspits,tc358762";
44-
reg = <0x0>;
45-
status = "okay";
46-
47-
ports {
48-
#address-cells = <1>;
49-
#size-cells = <0>;
50-
51-
port@0 {
52-
reg = <0>;
45+
port@0 {
46+
reg = <0>;
5347

54-
panel_in_dsi1: endpoint {
55-
remote-endpoint = <&dsi1_out_panel>;
56-
};
57-
};
58-
};
59-
};
60-
61-
ports {
62-
#address-cells = <1>;
63-
#size-cells = <0>;
64-
65-
port@1 {
66-
reg = <1>;
67-
#address-cells = <1>;
68-
#size-cells = <0>;
69-
70-
dsi1_out_panel: endpoint@0 {
71-
reg = <0>;
72-
remote-endpoint = <&panel_in_dsi1>;
73-
};
48+
panel_in_dsi1: endpoint {
49+
remote-endpoint = <&dsi1_out_panel>;
7450
};
7551
};
7652
};
7753
};
7854

79-
fragment@2 {
80-
target = <&i2c3>;
55+
ports {
56+
#address-cells = <1>;
57+
#size-cells = <0>;
8158

82-
__overlay__ {
83-
status = "okay";
84-
pinctrl-0 = <&i2c3m1_xfer>;
59+
port@1 {
60+
reg = <1>;
8561
#address-cells = <1>;
8662
#size-cells = <0>;
8763

88-
rockpi_ft5406: rockpi_ft5406@38 {
89-
compatible = "rockpi_ft5406";
90-
reg = <0x38>;
91-
};
92-
93-
rockpi_mcu: rockpi-mcu@45 {
94-
compatible = "rockpi_mcu";
95-
reg = <0x45>;
64+
dsi1_out_panel: endpoint@0 {
65+
reg = <0>;
66+
remote-endpoint = <&panel_in_dsi1>;
9667
};
9768
};
9869
};
70+
};
9971

100-
fragment@3 {
101-
target = <&video_phy1>;
72+
&i2c3 {
73+
status = "okay";
74+
pinctrl-0 = <&i2c3m1_xfer>;
75+
#address-cells = <1>;
76+
#size-cells = <0>;
10277

103-
__overlay__ {
104-
status = "okay";
105-
};
78+
rockpi_ft5406: rockpi_ft5406@38 {
79+
compatible = "rockpi_ft5406";
80+
reg = <0x38>;
10681
};
10782

108-
fragment@4 {
109-
target = <&dsi1_in_vp0>;
110-
111-
__overlay__ {
112-
status = "disabled";
113-
};
83+
rockpi_mcu: rockpi-mcu@45 {
84+
compatible = "rockpi_mcu";
85+
reg = <0x45>;
11486
};
87+
};
11588

116-
fragment@5 {
117-
target = <&dsi1_in_vp1>;
89+
&video_phy1 {
90+
status = "okay";
91+
};
11892

119-
__overlay__ {
120-
status = "okay";
121-
};
122-
};
93+
&dsi1_in_vp0 {
94+
status = "disabled";
95+
};
12396

124-
fragment@6 {
125-
target = <&route_dsi1>;
97+
&dsi1_in_vp1 {
98+
status = "okay";
99+
};
126100

127-
__overlay__ {
128-
status = "okay";
129-
};
130-
};
101+
&route_dsi1 {
102+
status = "okay";
131103
};

0 commit comments

Comments
 (0)