Skip to content

Commit bba8c52

Browse files
RadxaYuntianRadxaYuntian
authored
Merge pull request #285 from CodeChenL/main
fix: all rk3588 overlays are replaced with reference syntax
2 parents 531d034 + 56dabd5 commit bba8c52

File tree

98 files changed

+705
-1160
lines changed

Some content is hidden

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

98 files changed

+705
-1160
lines changed

‎arch/arm64/boot/dts/rockchip/overlays/rk3588-can1-m0.dts‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,13 @@
1111
exclusive = "GPIO3_B5", "GPIO3_B6";
1212
description = "Enable CAN1-M0.\nOn Radxa ROCK 5B this is RX pin 12 & TX pin 35.";
1313
};
14+
};
1415

15-
fragment@0 {
16-
target = <&can1>;
17-
18-
__overlay__ {
19-
status = "okay";
20-
compatible = "rockchip,can-2.0";
21-
assigned-clocks = <&cru CLK_CAN0>;
22-
assigned-clock-rates = <200000000>;
23-
pinctrl-names = "default";
24-
pinctrl-0 = <&can1m0_pins>;
25-
};
26-
};
16+
&can1 {
17+
status = "okay";
18+
compatible = "rockchip,can-2.0";
19+
assigned-clocks = <&cru CLK_CAN0>;
20+
assigned-clock-rates = <200000000>;
21+
pinctrl-names = "default";
22+
pinctrl-0 = <&can1m0_pins>;
2723
};

‎arch/arm64/boot/dts/rockchip/overlays/rk3588-can1-m1.dts‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,13 @@
1111
exclusive = "GPIO4_B2", "GPIO4_B3";
1212
description = "Enable CAN1-M0.\nOn Radxa ROCK 5A this is RX pin 13 & TX pin 11.\nOn Radxa ROCK 5B this is RX pin 5 & TX pin 3.\n";
1313
};
14+
};
1415

15-
fragment@0 {
16-
target = <&can1>;
17-
18-
__overlay__ {
19-
compatible = "rockchip,can-2.0";
20-
status = "okay";
21-
assigned-clocks = <&cru CLK_CAN1>;
22-
assigned-clock-rates = <200000000>;
23-
pinctrl-names = "default";
24-
pinctrl-0 = <&can1m1_pins>;
25-
};
26-
};
16+
&can1 {
17+
compatible = "rockchip,can-2.0";
18+
status = "okay";
19+
assigned-clocks = <&cru CLK_CAN1>;
20+
assigned-clock-rates = <200000000>;
21+
pinctrl-names = "default";
22+
pinctrl-0 = <&can1m1_pins>;
2723
};

‎arch/arm64/boot/dts/rockchip/overlays/rk3588-can2-m1.dts‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,13 @@
1111
exclusive = "GPIO0_D4", "GPIO0_D5";
1212
description = "Enable CAN2-M1.\nOn Radxa NX5 IO this is RX pin 3 & TX pin 5.\n";
1313
};
14+
};
1415

15-
fragment@0 {
16-
target = <&can2>;
17-
18-
__overlay__ {
19-
compatible = "rockchip,can-2.0";
20-
status = "okay";
21-
assigned-clocks = <&cru CLK_CAN1>;
22-
assigned-clock-rates = <200000000>;
23-
pinctrl-names = "default";
24-
pinctrl-0 = <&can2m1_pins>;
25-
};
26-
};
16+
&can2 {
17+
compatible = "rockchip,can-2.0";
18+
status = "okay";
19+
assigned-clocks = <&cru CLK_CAN1>;
20+
assigned-clock-rates = <200000000>;
21+
pinctrl-names = "default";
22+
pinctrl-0 = <&can2m1_pins>;
2723
};

‎arch/arm64/boot/dts/rockchip/overlays/rk3588-disable-fiq-debugger.dts‎

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -11,31 +11,23 @@
1111
exclusive = "GPIO0_B5", "GPIO0_B6", "fiq_debugger";
1212
description = "Disable FIQ Debugger.";
1313
};
14+
};
1415

15-
fragment@0 {
16-
target = <&fiq_debugger>;
17-
18-
__overlay__ {
19-
status = "disabled";
20-
};
21-
};
22-
23-
fragment@1 {
24-
target = <&pinctrl>;
16+
&fiq_debugger {
17+
status = "disabled";
18+
};
2519

26-
__overlay__ {
27-
pinctrl-0 = <&gpio0_b5_b6>;
28-
pinctrl-names = "default";
20+
&pinctrl {
21+
pinctrl-0 = <&gpio0_b5_b6>;
22+
pinctrl-names = "default";
2923

30-
gpio_func {
31-
gpio0_b5_b6: gpio0-b5-b6 {
32-
rockchip,pins =
33-
/* GPIO0_B5 */
34-
<0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>,
35-
/* GPIO0_B6 */
36-
<0 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;
37-
};
38-
};
24+
gpio_func {
25+
gpio0_b5_b6: gpio0-b5-b6 {
26+
rockchip,pins =
27+
/* GPIO0_B5 */
28+
<0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>,
29+
/* GPIO0_B6 */
30+
<0 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;
3931
};
4032
};
4133
};

‎arch/arm64/boot/dts/rockchip/overlays/rk3588-dwc3-host.dts‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,9 @@
99
exclusive = "usbdrd_dwc3-dr_mode";
1010
description = "Set OTG port 0 to Host mode.\nUse this when you want to connect USB devices.";
1111
};
12+
};
1213

13-
fragment@0 {
14-
target = <&usbdrd_dwc3_0>;
15-
16-
__overlay__ {
17-
status = "okay";
18-
dr_mode = "host";
19-
};
20-
};
14+
&usbdrd_dwc3_0 {
15+
status = "okay";
16+
dr_mode = "host";
2117
};

‎arch/arm64/boot/dts/rockchip/overlays/rk3588-dwc3-otg.dts‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,10 @@
99
exclusive = "usbdrd_dwc3-dr_mode";
1010
description = "Set OTG port 0 to OTG mode.\nUse this for automatic USB role switching.";
1111
};
12+
};
1213

13-
fragment@0 {
14-
target = <&usbdrd_dwc3_0>;
15-
16-
__overlay__ {
17-
status = "okay";
18-
dr_mode = "otg";
19-
usb-role-switch;
20-
};
21-
};
14+
&usbdrd_dwc3_0 {
15+
status = "okay";
16+
dr_mode = "otg";
17+
usb-role-switch;
2218
};

‎arch/arm64/boot/dts/rockchip/overlays/rk3588-dwc3-peripheral.dts‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,9 @@
99
exclusive = "usbdrd_dwc3-dr_mode";
1010
description = "Set OTG port 0 to Peripheral mode.\nUse this when you want to connect to another computer.";
1111
};
12+
};
1213

13-
fragment@0 {
14-
target = <&usbdrd_dwc3_0>;
15-
16-
__overlay__ {
17-
status = "okay";
18-
dr_mode = "peripheral";
19-
};
20-
};
14+
&usbdrd_dwc3_0 {
15+
status = "okay";
16+
dr_mode = "peripheral";
2117
};

‎arch/arm64/boot/dts/rockchip/overlays/rk3588-dwc3_1-host.dts‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,9 @@
99
exclusive = "usbdrd_dwc3_1-dr_mode";
1010
description = "Set OTG port 1 to Host mode (ROCK 5B V1.46+).\nUse this when you want to connect USB devices.";
1111
};
12+
};
1213

13-
fragment@0 {
14-
target = <&usbdrd_dwc3_1>;
15-
16-
__overlay__ {
17-
status = "okay";
18-
dr_mode = "host";
19-
};
20-
};
14+
&usbdrd_dwc3_1 {
15+
status = "okay";
16+
dr_mode = "host";
2117
};

‎arch/arm64/boot/dts/rockchip/overlays/rk3588-dwc3_1-peripheral.dts‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,9 @@
99
exclusive = "usbdrd_dwc3_1-dr_mode";
1010
description = "Set OTG port 1 to Peripheral mode (ROCK 5B V1.46+).\nUse this when you want to connect to another computer.";
1111
};
12+
};
1213

13-
fragment@0 {
14-
target = <&usbdrd_dwc3_1>;
15-
16-
__overlay__ {
17-
status = "okay";
18-
dr_mode = "peripheral";
19-
};
20-
};
14+
&usbdrd_dwc3_1 {
15+
status = "okay";
16+
dr_mode = "peripheral";
2117
};

‎arch/arm64/boot/dts/rockchip/overlays/rk3588-fiq-debugger-uart2m2.dts‎

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,15 @@
99
exclusive = "GPIO3_B1", "GPIO3_B2";
1010
description = "Enable FIQ Debugger on UART2-M2.\nOn Radxa ROCK 5B this is TX pin 36 & RX pin 38.\nOn Radxa ROCK 5B+ this is TX pin 36 & RX pin 38.";
1111
};
12+
};
1213

13-
fragment@0 {
14-
target = <&fiq_debugger>;
15-
16-
__overlay__ {
17-
status = "okay";
18-
rockchip,serial-id = <2>;
19-
pinctrl-names = "default";
20-
pinctrl-0 = <&uart2m2_xfer>;
21-
};
22-
};
23-
24-
fragment@1 {
25-
target = <&uart2>;
14+
&fiq_debugger {
15+
status = "okay";
16+
rockchip,serial-id = <2>;
17+
pinctrl-names = "default";
18+
pinctrl-0 = <&uart2m2_xfer>;
19+
};
2620

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

0 commit comments

Comments
 (0)