298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-04-15 18:03:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

rockchip: sync rk3588 dts with upstream
Some checks failed
OpenWrt-CI / Build OpenWrt Firmware (push) Failing after 4s
Details

Browse Source 
Fixes: #13425
This commit is contained in:
coolsnowwolf 2025-03-22 23:19:17 +08:00
parent efbab19385
commit d0efae101c
5 changed files with 325 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

152
target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts
View File

@ -1,11 +1,9 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
/dts-v1/; /dts-v1/;
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
#include <dt-bindings/leds/common.h> #include <dt-bindings/leds/common.h>
#include <dt-bindings/pinctrl/rockchip.h>
#include <dt-bindings/usb/pd.h> #include <dt-bindings/usb/pd.h>
#include "rk3588.dtsi" #include "rk3588.dtsi"
@ -26,7 +24,7 @@
compatible = "audio-graph-card"; compatible = "audio-graph-card";
dais = <&i2s0_8ch_p0>; dais = <&i2s0_8ch_p0>;
label = "rk3588-es8316"; label = "rk3588-es8316";
hp-det-gpio = <&gpio1 RK_PD5 GPIO_ACTIVE_HIGH>; hp-det-gpios = <&gpio1 RK_PD5 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&hp_detect>; pinctrl-0 = <&hp_detect>;
routing = "MIC2", "Mic Jack", routing = "MIC2", "Mic Jack",
@ -36,23 +34,23 @@
"Headphone", "Headphones"; "Headphone", "Headphones";
}; };
gpio-leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&led_green_pin>, <&led_red_pin>; pinctrl-0 = <&led_rgb_g>;
led_status_green: led-0 { led_green: led-0 {
color = <LED_COLOR_ID_GREEN>; color = <LED_COLOR_ID_GREEN>;
function = LED_FUNCTION_STATUS; function = LED_FUNCTION_STATUS;
gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
}; };
led_status_red: led-1 { led_red: led-1 {
color = <LED_COLOR_ID_RED>; color = <LED_COLOR_ID_RED>;
function = LED_FUNCTION_STATUS; function = LED_FUNCTION_STATUS;
gpios = <&gpio4 RK_PC5 GPIO_ACTIVE_HIGH>; gpios = <&gpio4 RK_PC5 GPIO_ACTIVE_HIGH>;
default-state = "on"; linux,default-trigger = "none";
}; };
}; };
@ -64,37 +62,27 @@
#cooling-cells = <2>; #cooling-cells = <2>;
}; };
vcc5v0_sys: vcc5v0-sys-regulator { vcc3v3_pcie2x1l2: regulator-vcc3v3-pcie2x1l2 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "vcc5v0_sys"; regulator-name = "vcc3v3_pcie2x1l2";
regulator-always-on; regulator-min-microvolt = <3300000>;
regulator-boot-on; regulator-max-microvolt = <3300000>;
regulator-min-microvolt = <5000000>; startup-delay-us = <5000>;
regulator-max-microvolt = <5000000>; vin-supply = <&vcc_3v3_s3>;
}; };
vcc3v3_pcie30: vcc3v3-pcie30-regulator { vcc3v3_pcie30: regulator-vcc3v3-pcie30 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high;
gpios = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>;
regulator-name = "vcc3v3_pcie30"; regulator-name = "vcc3v3_pcie30";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
enable-active-high; startup-delay-us = <5000>;
gpios = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>;
vin-supply = <&vcc5v0_sys>; vin-supply = <&vcc5v0_sys>;
pinctrl-names = "default";
pinctrl-0 = <&pcie30_pwren_h>;
}; };
vcc4v0_sys: vcc4v0-sys-regulator { vcc5v0_host: regulator-vcc5v0-host {
compatible = "regulator-fixed";
regulator-name = "vcc4v0_sys";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <4000000>;
regulator-max-microvolt = <4000000>;
};
vcc5v0_host: vcc5v0-host-regulator {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "vcc5v0_host"; regulator-name = "vcc5v0_host";
regulator-boot-on; regulator-boot-on;
@ -103,19 +91,28 @@
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
enable-active-high; enable-active-high;
gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>; gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>;
vin-supply = <&vcc5v0_sys>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&vcc5v0_host_en>; pinctrl-0 = <&vcc5v0_host_en>;
vin-supply = <&vcc5v0_sys>;
}; };
vcc_1v1_nldo_s3: vcc-1v1-nldo-s3-regulator { vcc5v0_sys: regulator-vcc5v0-sys {
compatible = "regulator-fixed";
regulator-name = "vcc5v0_sys";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
};
vcc_1v1_nldo_s3: regulator-vcc-1v1-nldo-s3 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "vcc_1v1_nldo_s3"; regulator-name = "vcc_1v1_nldo_s3";
regulator-always-on; regulator-always-on;
regulator-boot-on; regulator-boot-on;
regulator-min-microvolt = <1100000>; regulator-min-microvolt = <1100000>;
regulator-max-microvolt = <1100000>; regulator-max-microvolt = <1100000>;
vin-supply = <&vcc4v0_sys>; vin-supply = <&vcc5v0_sys>;
}; };
vbus_typec0: vbus-typec0 { vbus_typec0: vbus-typec0 {
@ -125,9 +122,9 @@
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
enable-active-high; enable-active-high;
gpio = <&gpio2 RK_PB6 GPIO_ACTIVE_HIGH>; gpio = <&gpio2 RK_PB6 GPIO_ACTIVE_HIGH>;
vin-supply = <&vcc5v0_sys>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&typec5v_pwren_h>; pinctrl-0 = <&typec5v_pwren_h>;
vin-supply = <&vcc5v0_sys>;
}; };
}; };
@ -195,7 +192,7 @@
regulator-min-microvolt = <550000>; regulator-min-microvolt = <550000>;
regulator-max-microvolt = <1050000>; regulator-max-microvolt = <1050000>;
regulator-ramp-delay = <2300>; regulator-ramp-delay = <2300>;
vin-supply = <&vcc4v0_sys>; vin-supply = <&vcc5v0_sys>;
regulator-state-mem { regulator-state-mem {
regulator-off-in-suspend; regulator-off-in-suspend;
@ -212,7 +209,7 @@
regulator-min-microvolt = <550000>; regulator-min-microvolt = <550000>;
regulator-max-microvolt = <1050000>; regulator-max-microvolt = <1050000>;
regulator-ramp-delay = <2300>; regulator-ramp-delay = <2300>;
vin-supply = <&vcc4v0_sys>; vin-supply = <&vcc5v0_sys>;
regulator-state-mem { regulator-state-mem {
regulator-off-in-suspend; regulator-off-in-suspend;
@ -235,7 +232,7 @@
regulator-min-microvolt = <550000>; regulator-min-microvolt = <550000>;
regulator-max-microvolt = <950000>; regulator-max-microvolt = <950000>;
regulator-ramp-delay = <2300>; regulator-ramp-delay = <2300>;
vin-supply = <&vcc4v0_sys>; vin-supply = <&vcc5v0_sys>;
regulator-state-mem { regulator-state-mem {
regulator-off-in-suspend; regulator-off-in-suspend;
@ -304,13 +301,12 @@
hym8563: rtc@51 { hym8563: rtc@51 {
compatible = "haoyu,hym8563"; compatible = "haoyu,hym8563";
reg = <0x51>; reg = <0x51>;
interrupt-parent = <&gpio0>;
interrupts = <RK_PB0 IRQ_TYPE_LEVEL_LOW>;
#clock-cells = <0>; #clock-cells = <0>;
clock-frequency = <32768>;
clock-output-names = "hym8563"; clock-output-names = "hym8563";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&hym8563_int>; pinctrl-0 = <&hym8563_int>;
interrupt-parent = <&gpio0>;
interrupts = <RK_PB0 IRQ_TYPE_LEVEL_LOW>;
wakeup-source; wakeup-source;
}; };
}; };
@ -353,31 +349,37 @@
}; };
}; };
&i2s5_8ch {
status = "okay";
};
/* phy1 - right ethernet port */
&pcie2x1l0 { &pcie2x1l0 {
reset-gpios = <&gpio4 RK_PA5 GPIO_ACTIVE_HIGH>; reset-gpios = <&gpio4 RK_PA5 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
/* phy2 - WiFi */
&pcie2x1l1 { &pcie2x1l1 {
reset-gpios = <&gpio3 RK_PD4 GPIO_ACTIVE_HIGH>; reset-gpios = <&gpio3 RK_PD4 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
pcie@0,0 { pcie@0,0 {
reg = <0x00300000 0 0 0 0>; reg = <0x300000 0 0 0 0>;
#address-cells = <3>; #address-cells = <3>;
#size-cells = <2>; #size-cells = <2>;
ranges; ranges;
wifi@30,0 { wifi: wifi@0,0 {
compatible = "pci14e4,449d"; compatible = "pci14e4,449d";
reg = <0x310000 0 0 0 0>; reg = <0x310000 0 0 0 0>;
interrupt-parent = <&gpio0>; clocks = <&hym8563>;
interrupts = <RK_PB2 IRQ_TYPE_LEVEL_LOW>; clock-names = "lpo";
interrupt-names = "host-wake";
}; };
}; };
}; };
/* phy0 - left ethernet port */
&pcie2x1l2 { &pcie2x1l2 {
reset-gpios = <&gpio3 RK_PB0 GPIO_ACTIVE_HIGH>; reset-gpios = <&gpio3 RK_PB0 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
@ -408,25 +410,19 @@
}; };
}; };
gpio-leds {
led_green_pin: led-green-pin {
rockchip,pins = <0 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;
};
led_red_pin: led-red-pin {
rockchip,pins = <4 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
hym8563 { hym8563 {
hym8563_int: hym8563-int { hym8563_int: hym8563-int {
rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
pcie30 { leds {
pcie30_pwren_h: pcie30-pwren-h { led_rgb_g: led-rgb-g {
rockchip,pins = <1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <0 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;
};
led_rgb_r: led-rgb-r {
rockchip,pins = <0 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
@ -462,13 +458,10 @@
&sdhci { &sdhci {
bus-width = <8>; bus-width = <8>;
cap-mmc-highspeed;
mmc-hs200-1_8v;
mmc-hs400-1_8v;
mmc-hs400-enhanced-strobe;
no-sdio; no-sdio;
no-sd; no-sd;
non-removable; non-removable;
mmc-hs200-1_8v;
status = "okay"; status = "okay";
}; };
@ -477,9 +470,10 @@
cap-mmc-highspeed; cap-mmc-highspeed;
cap-sd-highspeed; cap-sd-highspeed;
disable-wp; disable-wp;
max-frequency = <200000000>;
no-sdio; no-sdio;
no-mmc; no-mmc;
sd-uhs-sdr50; sd-uhs-sdr104;
vmmc-supply = <&vcc_3v3_s3>; vmmc-supply = <&vcc_3v3_s3>;
vqmmc-supply = <&vccio_sd_s0>; vqmmc-supply = <&vccio_sd_s0>;
status = "okay"; status = "okay";
@ -501,30 +495,30 @@
interrupt-parent = <&gpio0>; interrupt-parent = <&gpio0>;
interrupts = <7 IRQ_TYPE_LEVEL_LOW>; interrupts = <7 IRQ_TYPE_LEVEL_LOW>;
gpio-controller;
#gpio-cells = <2>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pmic_pins>, <&rk806_dvs1_null>, pinctrl-0 = <&pmic_pins>, <&rk806_dvs1_null>,
<&rk806_dvs2_null>, <&rk806_dvs3_null>; <&rk806_dvs2_null>, <&rk806_dvs3_null>;
system-power-controller; system-power-controller;
vcc1-supply = <&vcc4v0_sys>; vcc1-supply = <&vcc5v0_sys>;
vcc2-supply = <&vcc4v0_sys>; vcc2-supply = <&vcc5v0_sys>;
vcc3-supply = <&vcc4v0_sys>; vcc3-supply = <&vcc5v0_sys>;
vcc4-supply = <&vcc4v0_sys>; vcc4-supply = <&vcc5v0_sys>;
vcc5-supply = <&vcc4v0_sys>; vcc5-supply = <&vcc5v0_sys>;
vcc6-supply = <&vcc4v0_sys>; vcc6-supply = <&vcc5v0_sys>;
vcc7-supply = <&vcc4v0_sys>; vcc7-supply = <&vcc5v0_sys>;
vcc8-supply = <&vcc4v0_sys>; vcc8-supply = <&vcc5v0_sys>;
vcc9-supply = <&vcc4v0_sys>; vcc9-supply = <&vcc5v0_sys>;
vcc10-supply = <&vcc4v0_sys>; vcc10-supply = <&vcc5v0_sys>;
vcc11-supply = <&vcc_2v0_pldo_s3>; vcc11-supply = <&vcc_2v0_pldo_s3>;
vcc12-supply = <&vcc4v0_sys>; vcc12-supply = <&vcc5v0_sys>;
vcc13-supply = <&vcc_1v1_nldo_s3>; vcc13-supply = <&vcc_1v1_nldo_s3>;
vcc14-supply = <&vcc_1v1_nldo_s3>; vcc14-supply = <&vcc_1v1_nldo_s3>;
vcca-supply = <&vcc4v0_sys>; vcca-supply = <&vcc5v0_sys>;
gpio-controller;
#gpio-cells = <2>;
rk806_dvs1_null: dvs1-null-pins { rk806_dvs1_null: dvs1-null-pins {
pins = "gpio_pwrctrl1"; pins = "gpio_pwrctrl1";
@ -853,8 +847,6 @@
bluetooth { bluetooth {
compatible = "brcm,bcm43438-bt"; compatible = "brcm,bcm43438-bt";
clocks = <&hym8563>;
clock-names = "lpo";
device-wakeup-gpios = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>; device-wakeup-gpios = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>;
host-wakeup-gpios = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>; host-wakeup-gpios = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>;
shutdown-gpios = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>; shutdown-gpios = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>;

2
target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts
View File

@ -14,7 +14,7 @@
model = "FriendlyElec NanoPC-T6"; model = "FriendlyElec NanoPC-T6";
compatible = "friendlyarm,nanopc-t6", "rockchip,rk3588"; compatible = "friendlyarm,nanopc-t6", "rockchip,rk3588";
vdd_4g_3v3: vdd-4g-3v3-regulator { vdd_4g_3v3: regulator-vdd-4g-3v3 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpio = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>; gpio = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>;

79
target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
View File

@ -20,10 +20,20 @@
aliases { aliases {
mmc0 = &sdhci; mmc0 = &sdhci;
mmc1 = &sdmmc; mmc1 = &sdmmc;
led-boot = &sys_led; };
led-failsafe = &sys_led;
led-running = &sys_led; adc-keys-0 {
led-upgrade = &sys_led; compatible = "adc-keys";
io-channels = <&saradc 0>;
io-channel-names = "buttons";
keyup-threshold-microvolt = <1800000>;
poll-interval = <100>;
button-maskrom {
label = "Mask Rom";
linux,code = <KEY_SETUP>;
press-threshold-microvolt = <2000>;
};
}; };
chosen { chosen {
@ -43,7 +53,7 @@
sys_led: led-0 { sys_led: led-0 {
gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>; gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
label = "system-led"; label = "system-led";
default-state = "on"; linux,default-trigger = "heartbeat";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&sys_led_pin>; pinctrl-0 = <&sys_led_pin>;
}; };
@ -65,8 +75,7 @@
simple-audio-card,format = "i2s"; simple-audio-card,format = "i2s";
simple-audio-card,mclk-fs = <256>; simple-audio-card,mclk-fs = <256>;
simple-audio-card,hp-det-gpio = <&gpio1 RK_PC4 GPIO_ACTIVE_LOW>; simple-audio-card,hp-det-gpios = <&gpio1 RK_PC4 GPIO_ACTIVE_LOW>;
simple-audio-card,hp-pin-name = "Headphones";
simple-audio-card,widgets = simple-audio-card,widgets =
"Headphone", "Headphones", "Headphone", "Headphones",
@ -85,7 +94,7 @@
}; };
}; };
vcc12v_dcin: vcc12v-dcin-regulator { vcc12v_dcin: regulator-vcc12v-dcin {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "vcc12v_dcin"; regulator-name = "vcc12v_dcin";
regulator-always-on; regulator-always-on;
@ -95,7 +104,7 @@
}; };
/* vcc5v0_sys powers peripherals */ /* vcc5v0_sys powers peripherals */
vcc5v0_sys: vcc5v0-sys-regulator { vcc5v0_sys: regulator-vcc5v0-sys {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "vcc5v0_sys"; regulator-name = "vcc5v0_sys";
regulator-always-on; regulator-always-on;
@ -106,7 +115,7 @@
}; };
/* vcc4v0_sys powers the RK806, RK860's */ /* vcc4v0_sys powers the RK806, RK860's */
vcc4v0_sys: vcc4v0-sys-regulator { vcc4v0_sys: regulator-vcc4v0-sys {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "vcc4v0_sys"; regulator-name = "vcc4v0_sys";
regulator-always-on; regulator-always-on;
@ -116,7 +125,7 @@
vin-supply = <&vcc12v_dcin>; vin-supply = <&vcc12v_dcin>;
}; };
vcc_1v1_nldo_s3: vcc-1v1-nldo-s3-regulator { vcc_1v1_nldo_s3: regulator-vcc-1v1-nldo-s3 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "vcc-1v1-nldo-s3"; regulator-name = "vcc-1v1-nldo-s3";
regulator-always-on; regulator-always-on;
@ -126,7 +135,7 @@
vin-supply = <&vcc4v0_sys>; vin-supply = <&vcc4v0_sys>;
}; };
vcc_3v3_pcie20: vcc3v3-pcie20-regulator { vcc_3v3_pcie20: regulator-vcc3v3-pcie20 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "vcc_3v3_pcie20"; regulator-name = "vcc_3v3_pcie20";
regulator-always-on; regulator-always-on;
@ -136,7 +145,7 @@
vin-supply = <&vcc_3v3_s3>; vin-supply = <&vcc_3v3_s3>;
}; };
vbus5v0_typec: vbus5v0-typec-regulator { vbus5v0_typec: regulator-vbus5v0-typec {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpio = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>; gpio = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>;
@ -150,7 +159,21 @@
vin-supply = <&vcc5v0_sys>; vin-supply = <&vcc5v0_sys>;
}; };
vcc3v3_pcie2x1l0: vcc3v3-pcie2x1l0-regulator { vbus5v0_usb: regulator-vbus5v0-usb {
compatible = "regulator-fixed";
enable-active-high;
gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&usb5v_pwren>;
regulator-always-on;
regulator-boot-on;
regulator-name = "vbus5v0_usb";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
vin-supply = <&vcc5v0_sys>;
};
vcc3v3_pcie2x1l0: regulator-vcc3v3-pcie2x1l0 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_HIGH>; gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_HIGH>;
@ -162,7 +185,7 @@
vin-supply = <&vcc5v0_sys>; vin-supply = <&vcc5v0_sys>;
}; };
vcc3v3_pcie30: vcc3v3-pcie30-regulator { vcc3v3_pcie30: regulator-vcc3v3-pcie30 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpios = <&gpio2 RK_PC5 GPIO_ACTIVE_HIGH>; gpios = <&gpio2 RK_PC5 GPIO_ACTIVE_HIGH>;
@ -174,9 +197,8 @@
vin-supply = <&vcc5v0_sys>; vin-supply = <&vcc5v0_sys>;
}; };
vcc3v3_sd_s0: vcc3v3-sd-s0-regulator { vcc3v3_sd_s0: regulator-vcc3v3-sd-s0 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-low;
gpio = <&gpio4 RK_PA5 GPIO_ACTIVE_LOW>; gpio = <&gpio4 RK_PA5 GPIO_ACTIVE_LOW>;
regulator-boot-on; regulator-boot-on;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
@ -492,6 +514,10 @@
rockchip,pins = <1 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <1 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
usb5v_pwren: usb5v_pwren {
rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
};
usbc0_int: usbc0-int { usbc0_int: usbc0-int {
rockchip,pins = <0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
@ -650,7 +676,6 @@
regulator-boot-on; regulator-boot-on;
regulator-min-microvolt = <550000>; regulator-min-microvolt = <550000>;
regulator-max-microvolt = <950000>; regulator-max-microvolt = <950000>;
regulator-init-microvolt = <750000>;
regulator-ramp-delay = <12500>; regulator-ramp-delay = <12500>;
regulator-name = "vdd_vdenc_s0"; regulator-name = "vdd_vdenc_s0";
@ -891,6 +916,14 @@
status = "okay"; status = "okay";
}; };
&u2phy1 {
status = "okay";
};
&u2phy1_otg {
status = "okay";
};
&u2phy2_host { &u2phy2_host {
status = "okay"; status = "okay";
}; };
@ -930,6 +963,11 @@
}; };
}; };
&usbdp_phy1 {
phy-supply = <&vbus5v0_usb>;
status = "okay";
};
&usb_host0_ehci { &usb_host0_ehci {
status = "okay"; status = "okay";
}; };
@ -950,6 +988,11 @@
}; };
}; };
&usb_host1_xhci {
dr_mode = "host";
status = "okay";
};
&usb_host1_ehci { &usb_host1_ehci {
status = "okay"; status = "okay";
}; };

187
target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts
View File

@ -19,12 +19,6 @@
aliases { aliases {
mmc0 = &sdhci; mmc0 = &sdhci;
mmc1 = &sdmmc; mmc1 = &sdmmc;
serial2 = &uart2;
led-boot = &status_led;
led-failsafe = &status_led;
led-running = &status_led;
led-upgrade = &status_led;
}; };
chosen { chosen {
@ -83,7 +77,7 @@
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&blue_led_pin>; pinctrl-0 = <&blue_led_pin>;
status_led: led { led_blue_gpio: led {
color = <LED_COLOR_ID_BLUE>; color = <LED_COLOR_ID_BLUE>;
function = LED_FUNCTION_INDICATOR; function = LED_FUNCTION_INDICATOR;
function-enumerator = <1>; function-enumerator = <1>;
@ -102,7 +96,7 @@
pwm-leds { pwm-leds {
compatible = "pwm-leds"; compatible = "pwm-leds";
led { led_green_pwm: led {
color = <LED_COLOR_ID_GREEN>; color = <LED_COLOR_ID_GREEN>;
function = LED_FUNCTION_INDICATOR; function = LED_FUNCTION_INDICATOR;
function-enumerator = <2>; function-enumerator = <2>;
@ -119,7 +113,7 @@
simple-audio-card,aux-devs = <&speaker_amp>, <&headphone_amp>; simple-audio-card,aux-devs = <&speaker_amp>, <&headphone_amp>;
simple-audio-card,format = "i2s"; simple-audio-card,format = "i2s";
simple-audio-card,mclk-fs = <256>; simple-audio-card,mclk-fs = <256>;
simple-audio-card,hp-det-gpio = <&gpio1 RK_PD3 GPIO_ACTIVE_LOW>; simple-audio-card,hp-det-gpios = <&gpio1 RK_PD3 GPIO_ACTIVE_LOW>;
simple-audio-card,bitclock-master = <&daicpu>; simple-audio-card,bitclock-master = <&daicpu>;
simple-audio-card,frame-master = <&daicpu>; simple-audio-card,frame-master = <&daicpu>;
/*TODO: SARADC_IN3 is used as MIC detection / key input */ /*TODO: SARADC_IN3 is used as MIC detection / key input */
@ -164,7 +158,7 @@
}; };
}; };
vcc3v3_pcie30: vcc3v3-pcie30-regulator { vcc3v3_pcie30: regulator-vcc3v3-pcie30 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpios = <&gpio2 RK_PB6 GPIO_ACTIVE_HIGH>; gpios = <&gpio2 RK_PB6 GPIO_ACTIVE_HIGH>;
@ -175,17 +169,17 @@
vin-supply = <&vcc5v0_sys>; vin-supply = <&vcc5v0_sys>;
}; };
vcc3v3_pcie_eth: vcc3v3-pcie-eth-regulator { vcc3v3_pcie_eth: regulator-vcc3v3-pcie-eth {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
gpios = <&gpio3 RK_PB4 GPIO_ACTIVE_LOW>; gpios = <&gpio3 RK_PB4 GPIO_ACTIVE_LOW>;
regulator-name = "vcc3v3_pcie_eth"; regulator-name = "vcc3v3_pcie_eth";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
startup-delay-us = <50000>; startup-delay-us = <50000>;
vin-supply = <&vcc5v0_sys>; vin-supply = <&vcc_3v3_s3>;
}; };
vcc3v3_wf: vcc3v3-wf-regulator { vcc3v3_wf: regulator-vcc3v3-wf {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpios = <&gpio2 RK_PC5 GPIO_ACTIVE_HIGH>; gpios = <&gpio2 RK_PC5 GPIO_ACTIVE_HIGH>;
@ -196,7 +190,7 @@
vin-supply = <&vcc5v0_sys>; vin-supply = <&vcc5v0_sys>;
}; };
vcc5v0_sys: vcc5v0-sys-regulator { vcc5v0_sys: regulator-vcc5v0-sys {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "vcc5v0_sys"; regulator-name = "vcc5v0_sys";
regulator-always-on; regulator-always-on;
@ -205,7 +199,7 @@
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
}; };
vcc5v0_usb20: vcc5v0-usb20-regulator { vcc5v0_usb20: regulator-vcc5v0-usb20 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpio = <&gpio3 RK_PB7 GPIO_ACTIVE_HIGH>; gpio = <&gpio3 RK_PB7 GPIO_ACTIVE_HIGH>;
@ -216,6 +210,18 @@
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
vin-supply = <&vcc5v0_sys>; vin-supply = <&vcc5v0_sys>;
}; };
vbus5v0_typec: regulator-vbus-typec {
compatible = "regulator-fixed";
enable-active-high;
gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&typec5v_pwren>;
regulator-name = "vbus5v0_typec";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
vin-supply = <&vcc5v0_sys>;
};
}; };
&combphy0_ps { &combphy0_ps {
@ -262,6 +268,11 @@
cpu-supply = <&vdd_cpu_lit_s0>; cpu-supply = <&vdd_cpu_lit_s0>;
}; };
&gpu {
mali-supply = <&vdd_gpu_s0>;
status = "okay";
};
&i2c0 { &i2c0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c0m2_xfer>; pinctrl-0 = <&i2c0m2_xfer>;
@ -306,6 +317,57 @@
clock-frequency = <400000>; clock-frequency = <400000>;
status = "okay"; status = "okay";
usbc0: usb-typec@22 {
compatible = "fcs,fusb302";
reg = <0x22>;
interrupt-parent = <&gpio0>;
interrupts = <RK_PD3 IRQ_TYPE_LEVEL_LOW>;
pinctrl-names = "default";
pinctrl-0 = <&usbc0_int>;
vbus-supply = <&vbus5v0_typec>;
status = "okay";
usb_con: connector {
compatible = "usb-c-connector";
data-role = "dual";
label = "USB-C";
power-role = "dual";
op-sink-microwatt = <10>;
source-pdos = <PDO_FIXED(5000, 1400, PDO_FIXED_USB_COMM)>;
sink-pdos = <PDO_FIXED(5000, 10, PDO_FIXED_USB_COMM)>;
try-power-role = "source";
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
usbc0_hs: endpoint {
remote-endpoint = <&usb_host0_xhci_drd_sw>;
};
};
port@1 {
reg = <1>;
usbc0_ss: endpoint {
remote-endpoint = <&usbdp_phy0_typec_ss>;
};
};
port@2 {
reg = <2>;
usbc0_sbu: endpoint {
remote-endpoint = <&usbdp_phy0_typec_sbu>;
};
};
};
};
};
hym8563: rtc@51 { hym8563: rtc@51 {
compatible = "haoyu,hym8563"; compatible = "haoyu,hym8563";
reg = <0x51>; reg = <0x51>;
@ -324,14 +386,13 @@
/* PLDO2 vcca 1.8V, BUCK8 gated by PLDO2 being enabled */ /* PLDO2 vcca 1.8V, BUCK8 gated by PLDO2 being enabled */
es8388: audio-codec@11 { es8388: audio-codec@11 {
compatible = "everest,es8388"; compatible = "everest,es8388", "everest,es8328";
reg = <0x11>; reg = <0x11>;
clocks = <&cru I2S0_8CH_MCLKOUT>; clocks = <&cru I2S0_8CH_MCLKOUT>;
clock-names = "mclk"; AVDD-supply = <&vcc_3v3_s0>;
AVDD-supply = <&vcc_1v8_s0>;
DVDD-supply = <&vcc_1v8_s0>; DVDD-supply = <&vcc_1v8_s0>;
HPVDD-supply = <&vcc_3v3_s0>; HPVDD-supply = <&vcc_3v3_s0>;
PVDD-supply = <&vcc_3v3_s0>; PVDD-supply = <&vcc_1v8_s0>;
assigned-clocks = <&cru I2S0_8CH_MCLKOUT>; assigned-clocks = <&cru I2S0_8CH_MCLKOUT>;
assigned-clock-rates = <12288000>; assigned-clock-rates = <12288000>;
#sound-dai-cells = <0>; #sound-dai-cells = <0>;
@ -357,6 +418,14 @@
status = "okay"; status = "okay";
}; };
&i2s5_8ch {
status = "okay";
};
&i2s6_8ch {
status = "okay";
};
/* phy1 - M.KEY socket */ /* phy1 - M.KEY socket */
&pcie2x1l0 { &pcie2x1l0 {
reset-gpios = <&gpio4 RK_PA5 GPIO_ACTIVE_HIGH>; reset-gpios = <&gpio4 RK_PA5 GPIO_ACTIVE_HIGH>;
@ -418,6 +487,16 @@
rockchip,pins = <3 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <3 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
usb-typec {
usbc0_int: usbc0-int {
rockchip,pins = <0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_up>;
};
typec5v_pwren: typec5v-pwren {
rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
}; };
&pwm2 { &pwm2 {
@ -450,6 +529,7 @@
&sdmmc { &sdmmc {
bus-width = <4>; bus-width = <4>;
cap-sd-highspeed; cap-sd-highspeed;
cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
disable-wp; disable-wp;
max-frequency = <150000000>; max-frequency = <150000000>;
no-sdio; no-sdio;
@ -491,6 +571,7 @@
pinctrl-0 = <&pmic_pins>, <&rk806_dvs1_null>, pinctrl-0 = <&pmic_pins>, <&rk806_dvs1_null>,
<&rk806_dvs2_null>, <&rk806_dvs3_null>; <&rk806_dvs2_null>, <&rk806_dvs3_null>;
spi-max-frequency = <1000000>; spi-max-frequency = <1000000>;
system-power-controller;
vcc1-supply = <&vcc5v0_sys>; vcc1-supply = <&vcc5v0_sys>;
vcc2-supply = <&vcc5v0_sys>; vcc2-supply = <&vcc5v0_sys>;
@ -512,7 +593,7 @@
#gpio-cells = <2>; #gpio-cells = <2>;
rk806_dvs1_null: dvs1-null-pins { rk806_dvs1_null: dvs1-null-pins {
pins = "gpio_pwrctrl2"; pins = "gpio_pwrctrl1";
function = "pin_fun0"; function = "pin_fun0";
}; };
@ -807,6 +888,23 @@
status = "okay"; status = "okay";
}; };
&u2phy0 {
status = "okay";
};
&u2phy0_otg {
status = "okay";
};
&u2phy1 {
status = "okay";
};
&u2phy1_otg {
phy-supply = <&vcc5v0_sys>;
status = "okay";
};
&u2phy2 { &u2phy2 {
status = "okay"; status = "okay";
}; };
@ -835,6 +933,14 @@
status = "okay"; status = "okay";
}; };
&usbdp_phy0 {
status = "okay";
};
&usbdp_phy1 {
status = "okay";
};
&usb_host0_ehci { &usb_host0_ehci {
status = "okay"; status = "okay";
}; };
@ -843,6 +949,10 @@
status = "okay"; status = "okay";
}; };
&usb_host0_xhci {
status = "okay";
};
&usb_host1_ehci { &usb_host1_ehci {
status = "okay"; status = "okay";
}; };
@ -850,3 +960,40 @@
&usb_host1_ohci { &usb_host1_ohci {
status = "okay"; status = "okay";
}; };
&usb_host1_xhci {
dr_mode = "host";
status = "okay";
};
&usbdp_phy0 {
mode-switch;
orientation-switch;
sbu1-dc-gpios = <&gpio4 RK_PA6 GPIO_ACTIVE_HIGH>;
sbu2-dc-gpios = <&gpio4 RK_PA7 GPIO_ACTIVE_HIGH>;
port {
#address-cells = <1>;
#size-cells = <0>;
usbdp_phy0_typec_ss: endpoint@0 {
reg = <0>;
remote-endpoint = <&usbc0_ss>;
};
usbdp_phy0_typec_sbu: endpoint@1 {
reg = <1>;
remote-endpoint = <&usbc0_sbu>;
};
};
};
&usb_host0_xhci {
usb-role-switch;
port {
usb_host0_xhci_drd_sw: endpoint {
remote-endpoint = <&usbc0_hs>;
};
};
};

49
target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts
View File

@ -14,13 +14,8 @@
compatible = "xunlong,orangepi-5", "rockchip,rk3588s"; compatible = "xunlong,orangepi-5", "rockchip,rk3588s";
aliases { aliases {
ethernet0 = &gmac1;
mmc0 = &sdmmc; mmc0 = &sdmmc;
serial2 = &uart2;
led-boot = &status_led;
led-failsafe = &status_led;
led-running = &status_led;
led-upgrade = &status_led;
}; };
chosen { chosen {
@ -41,18 +36,19 @@
}; };
}; };
leds { pwm-leds {
compatible = "gpio-leds"; compatible = "pwm-leds";
pinctrl-names = "default";
pinctrl-0 =<&leds_gpio>;
status_led: led-1 { led {
gpios = <&gpio1 RK_PA2 GPIO_ACTIVE_HIGH>; color = <LED_COLOR_ID_GREEN>;
label = "status_led"; function = LED_FUNCTION_STATUS;
linux,default-trigger = "heartbeat";
max-brightness = <255>;
pwms = <&pwm0 0 25000 0>;
}; };
}; };
vbus_typec: vbus-typec-regulator { vbus_typec: regulator-vbus-typec {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpio = <&gpio3 RK_PC0 GPIO_ACTIVE_HIGH>; gpio = <&gpio3 RK_PC0 GPIO_ACTIVE_HIGH>;
@ -64,7 +60,7 @@
vin-supply = <&vcc5v0_sys>; vin-supply = <&vcc5v0_sys>;
}; };
vcc5v0_sys: vcc5v0-sys-regulator { vcc5v0_sys: regulator-vcc5v0-sys {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "vcc5v0_sys"; regulator-name = "vcc5v0_sys";
regulator-always-on; regulator-always-on;
@ -73,9 +69,8 @@
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
}; };
vcc_3v3_sd_s0: vcc-3v3-sd-s0-regulator { vcc_3v3_sd_s0: regulator-vcc-3v3-sd-s0 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-low;
gpios = <&gpio4 RK_PB5 GPIO_ACTIVE_LOW>; gpios = <&gpio4 RK_PB5 GPIO_ACTIVE_LOW>;
regulator-name = "vcc_3v3_sd_s0"; regulator-name = "vcc_3v3_sd_s0";
regulator-boot-on; regulator-boot-on;
@ -84,7 +79,7 @@
vin-supply = <&vcc_3v3_s3>; vin-supply = <&vcc_3v3_s3>;
}; };
vcc3v3_pcie20: vcc3v3-pcie20-regulator { vcc3v3_pcie20: regulator-vcc3v3-pcie20 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpios = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>;
@ -285,6 +280,10 @@
}; };
}; };
&i2s5_8ch {
status = "okay";
};
&mdio1 { &mdio1 {
rgmii_phy1: ethernet-phy@1 { rgmii_phy1: ethernet-phy@1 {
compatible = "ethernet-phy-ieee802.3-c22"; compatible = "ethernet-phy-ieee802.3-c22";
@ -302,12 +301,6 @@
}; };
&pinctrl { &pinctrl {
gpio-func {
leds_gpio: leds-gpio {
rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
hym8563 { hym8563 {
hym8563_int: hym8563-int { hym8563_int: hym8563-int {
rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
@ -325,6 +318,12 @@
}; };
}; };
&pwm0 {
pinctrl-0 = <&pwm0m2_pins>;
pinctrl-names = "default";
status = "okay";
};
&saradc { &saradc {
vref-supply = <&avcc_1v8_s0>; vref-supply = <&avcc_1v8_s0>;
status = "okay"; status = "okay";
@ -396,7 +395,7 @@
#gpio-cells = <2>; #gpio-cells = <2>;
rk806_dvs1_null: dvs1-null-pins { rk806_dvs1_null: dvs1-null-pins {
pins = "gpio_pwrctrl2"; pins = "gpio_pwrctrl1";
function = "pin_fun0"; function = "pin_fun0";
}; };