Skip to content

Sync Rock5B, 5B-Plus, 5T DT's #381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HeyMeco merged 3 commits into from
Aug 12, 2025
Merged

Sync Rock5B, 5B-Plus, 5T DT's #381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d9cb99d
Sync Rock5B, 5B-Plus, 5T DT's
HeyMeco Aug 10, 2025
37cf98c
Keep Armbian soc_thermal for fan speed on Rock5B
HeyMeco Aug 11, 2025
2c0e217
Merge branch 'rk-6.1-rkr5.1' into ForArmbian-2508
HeyMeco Aug 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions arch/arm64/boot/dts/rockchip/rk3588-radxa-rock-5b+.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
compatible = "pwm-fan";
#cooling-cells = <2>;
cooling-levels = <0 64 128 192 255>;
pwms = <&pwm1 0 10000 0>;
pwms = <&pwm1 0 60000 0>;
};

vcc12v_dcin: vcc12v-dcin {
Expand Down Expand Up @@ -149,8 +149,6 @@
vcc5v0_host: vcc5v0-host-regulator {
compatible = "regulator-fixed";
regulator-name = "vcc5v0_host";
regulator-boot-on;
regulator-always-on;
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
enable-active-high;
Expand Down Expand Up @@ -256,10 +254,6 @@
status = "okay";
};

&avsd {
status = "okay";
};

&cpu_l0 {
cpu-supply = <&vdd_cpu_lit_s0>;
mem-supply = <&vdd_cpu_lit_mem_s0>;
Expand Down Expand Up @@ -723,6 +717,7 @@
};

&u2phy1_otg {
vbus-supply = <&vcc5v0_host>;
status = "okay";
};

Expand Down Expand Up @@ -774,6 +769,7 @@
compatible = "usb-c-connector";
label = "USB-C";
data-role = "dual";
faster-pd-negotiation;
power-role = "dual";
try-power-role = "sink";
op-sink-microwatt = <1000000>;
Expand Down Expand Up @@ -1284,4 +1280,4 @@
"", "", "", "",
/* GPIO4_D4-D7 */
"", "", "", "";
};
};
178 changes: 79 additions & 99 deletions arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
/*
* Copyright (c) 2022 Rockchip Electronics Co., Ltd.
* Copyright (c) 2022 Radxa Limited
* Copyright (c) 2024 Rockchip Electronics Co., Ltd.
* Copyright (c) 2024 Radxa Computer (Shenzhen) Co., Ltd.
*
*/

Expand All @@ -26,6 +26,13 @@

/delete-node/ chosen;

fan0: pwm-fan {
compatible = "pwm-fan";
#cooling-cells = <2>;
cooling-levels = <0 64 128 192 255>;
pwms = <&pwm1 0 60000 0>;
};

vcc12v_dcin: vcc12v-dcin {
compatible = "regulator-fixed";
regulator-name = "vcc12v_dcin";
Expand All @@ -45,20 +52,20 @@
vin-supply = <&vcc12v_dcin>;
};

wifi_disable: wifi-diable-gpio-regulator {
bt_wake: bt-wake-gpio-regulator {
compatible = "regulator-fixed";
regulator-name = "wifi_disable";
regulator-name = "bt_wake";
enable-active-high;
gpio = <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>;
gpio = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>;
regulator-boot-on;
regulator-always-on;
};

bt_wake: bt-wake-gpio-regulator {
wifi_disable: wifi-diable-gpio-regulator {
compatible = "regulator-fixed";
regulator-name = "bt_wake";
regulator-name = "wifi_disable";
enable-active-high;
gpio = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>;
gpio = <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>;
regulator-boot-on;
regulator-always-on;
};
Expand Down Expand Up @@ -114,7 +121,7 @@
dp0_sound: dp0-sound {
status = "okay";
compatible = "rockchip,hdmi";
rockchip,card-name = "rockchip-dp0";
rockchip,card-name= "rockchip-hdmi2";
rockchip,mclk-fs = <512>;
rockchip,cpu = <&spdif_tx2>;
rockchip,codec = <&dp0 1>;
Expand All @@ -127,7 +134,7 @@
rockchip,card-name = "rockchip-es8316";
rockchip,format = "i2s";
rockchip,mclk-fs = <256>;
rockchip,cpu = <&i2s0_8ch >;
rockchip,cpu = <&i2s0_8ch>;
rockchip,codec = <&es8316>;
poll-interval = <100>;
io-channels = <&saradc 3>;
Expand All @@ -146,8 +153,6 @@
vcc5v0_host: vcc5v0-host-regulator {
compatible = "regulator-fixed";
regulator-name = "vcc5v0_host";
regulator-boot-on;
regulator-always-on;
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
enable-active-high;
Expand Down Expand Up @@ -190,17 +195,6 @@
vin-supply = <&vcc5v0_sys>;
};

gpio-leds {
compatible = "gpio-leds";
pinctrl-names = "default";

user-led2 {
gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat";
default-state = "on";
};
};

/* If hdmirx node is disabled, delete the reserved-memory node here. */
reserved-memory {
#address-cells = <2>;
Expand All @@ -217,22 +211,27 @@
};

hdmiin-sound {
status = "okay";
compatible = "rockchip,hdmi";
rockchip,mclk-fs = <128>;
rockchip,format = "i2s";
rockchip,bitclock-master = <&hdmirx_ctrler>;
rockchip,frame-master = <&hdmirx_ctrler>;
rockchip,card-name = "rockchip-hdmiin";
rockchip,card-name = "rockchip,hdmiin";
rockchip,cpu = <&i2s7_8ch>;
rockchip,codec = <&hdmirx_ctrler 0>;
rockchip,jack-det;
};

fan0: pwm-fan {
compatible = "pwm-fan";
#cooling-cells = <2>;
cooling-levels = <72 94 117 139 162 184 207 229 255>;
pwms = <&pwm1 0 10000 0>;
gpio-leds {
compatible = "gpio-leds";
pinctrl-names = "default";

user-led2 {
gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat";
default-state = "on";
};
};
};

Expand All @@ -244,10 +243,6 @@
status = "okay";
};

&avsd {
status = "okay";
};

&cpu_l0 {
cpu-supply = <&vdd_cpu_lit_s0>;
mem-supply = <&vdd_cpu_lit_mem_s0>;
Expand Down Expand Up @@ -489,6 +484,7 @@
max-frequency = <200000000>;
mmc-hs400-1_8v;
mmc-hs400-enhanced-strobe;
mmc-hs200-1_8v;
status = "okay";
};

Expand Down Expand Up @@ -639,26 +635,6 @@
&display_subsystem {
clocks = <&hdptxphy_hdmi0>, <&hdptxphy_hdmi1>;
clock-names = "hdmi0_phy_pll", "hdmi1_phy_pll";

route {
route_hdmi0: route-hdmi0 {
status = "okay";
logo,uboot = "logo.bmp";
logo,kernel = "logo_kernel.bmp";
logo,mode = "center";
charge_logo,mode = "center";
connect = <&vp0_out_hdmi0>;
};

route_hdmi1: route-hdmi1 {
status = "okay";
logo,uboot = "logo.bmp";
logo,kernel = "logo_kernel.bmp";
logo,mode = "center";
charge_logo,mode = "center";
connect = <&vp1_out_hdmi1>;
};
};
};

&hdptxphy_hdmi0 {
Expand All @@ -671,7 +647,8 @@

&hdmi0 {
status = "okay";
cec-enable = "true";
cec-enable = "true";
enable-gpios = <&gpio4 RK_PB1 GPIO_ACTIVE_HIGH>;
};

&hdmi0_in_vp0 {
Expand All @@ -694,7 +671,8 @@
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&hdmim0_tx1_cec &hdmim0_tx1_hpd &hdmim1_tx1_scl &hdmim1_tx1_sda>;
cec-enable = "true";
cec-enable = "true";
enable-gpios = <&gpio4 RK_PA1 GPIO_ACTIVE_HIGH>;
};

&hdmi1_in_vp0 {
Expand All @@ -713,25 +691,24 @@
status = "okay";
};

&hdptxphy_hdmi0 {
status = "okay";
};

&hdptxphy_hdmi1 {
status = "okay";
};

/* Should work with at least 128MB cma reserved above. */
&hdmirx_ctrler {
status = "okay";

#sound-dai-cells = <1>;
/* Effective level used to trigger HPD: 0-low, 1-high */
hpd-trigger-level = <1>;
hdmirx-det-gpios = <&gpio1 RK_PC6 GPIO_ACTIVE_LOW>;

pinctrl-0 = <&hdmim1_rx_cec &hdmim1_rx_hpdin &hdmim1_rx_scl &hdmim1_rx_sda &hdmirx_det>;
pinctrl-names = "default";
};

&hdptxphy_hdmi0 {
status = "okay";
};

&hdptxphy_hdmi1 {
status = "okay";
#sound-dai-cells = <1>;
};

&i2s5_8ch {
Expand Down Expand Up @@ -832,6 +809,7 @@
};

&u2phy1_otg {
vbus-supply = <&vcc5v0_host>;
status = "okay";
};

Expand Down Expand Up @@ -1058,6 +1036,8 @@
reg = <0x11>;
clocks = <&mclkout_i2s0>;
clock-names = "mclk";
assigned-clocks = <&mclkout_i2s0>;
assigned-clock-rates = <12288000>;
pinctrl-names = "default";
pinctrl-0 = <&i2s0_mclk>;
#sound-dai-cells = <0>;
Expand All @@ -1071,40 +1051,9 @@
#sound-dai-cells = <0>;
pinctrl-names = "default";
pinctrl-0 = <&i2s0_lrck
&i2s0_sclk
&i2s0_sdi0
&i2s0_sdo0>;
};

&sfc {
status = "okay";
max-freq = <50000000>;
#address-cells = <1>;
#size-cells = <0>;
pinctrl-names = "default";
pinctrl-0 = <&fspim2_pins>;

spi_flash: spi-flash@0 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "jedec,spi-nor";
reg = <0x0>;
spi-max-frequency = <50000000>;
spi-tx-bus-width = <1>;
spi-rx-bus-width = <4>;
status = "okay";

partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;

loader@0 {
label = "loader";
reg = <0x0 0x1000000>;
};
};
};
&i2s0_sclk
&i2s0_sdi0
&i2s0_sdo0>;
};

&rockchip_suspend {
Expand Down Expand Up @@ -1166,6 +1115,37 @@
};
};

&sfc {
status = "okay";
max-freq = <50000000>;
#address-cells = <1>;
#size-cells = <0>;
pinctrl-names = "default";
pinctrl-0 = <&fspim2_pins>;

spi_flash: spi-flash@0 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "jedec,spi-nor";
reg = <0x0>;
spi-max-frequency = <50000000>;
spi-tx-bus-width = <1>;
spi-rx-bus-width = <4>;
status = "okay";

partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;

loader@0 {
label = "loader";
reg = <0x0 0x1000000>;
};
};
};
};

&pinctrl {
usb {
vcc5v0_host_en: vcc5v0-host-en {
Expand Down
3 changes: 1 addition & 2 deletions arch/arm64/boot/dts/rockchip/rk3588-rock-5t.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,6 @@
vcc5v0_host: vcc5v0-host-regulator {
compatible = "regulator-fixed";
regulator-name = "vcc5v0_host";
regulator-boot-on;
regulator-always-on;
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
enable-active-high;
Expand Down Expand Up @@ -722,6 +720,7 @@
};

&u2phy1_otg {
vbus-supply = <&vcc5v0_host>;
status = "okay";
};

Expand Down
Loading