fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rockchip: remove LED label hack

Browse Source 
Now we support parsing the color and function properties.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2024-02-12 19:52:40 +08:00
parent ee8341f1fa
commit bdff7b7758
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
20 changed files with 114 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
target/linux/rockchip/armv8/base-files/etc/board.d/01_leds
View File

@ -30,13 +30,13 @@ friendlyarm,nanopi-r5c)
;; ;;
friendlyarm,nanopi-r5s) friendlyarm,nanopi-r5s)
ucidef_set_led_netdev "wan" "WAN" "green:wan" "eth0" ucidef_set_led_netdev "wan" "WAN" "green:wan" "eth0"
ucidef_set_led_netdev "lan1" "LAN1" "green:lan1" "eth1" ucidef_set_led_netdev "lan1" "LAN1" "green:lan-1" "eth1"
ucidef_set_led_netdev "lan2" "LAN2" "green:lan2" "eth2" ucidef_set_led_netdev "lan2" "LAN2" "green:lan-2" "eth2"
;; ;;
friendlyarm,nanopi-r6s) friendlyarm,nanopi-r6s)
ucidef_set_led_netdev "wan" "WAN" "green:wan" "eth2" ucidef_set_led_netdev "wan" "WAN" "green:wan" "eth2"
ucidef_set_led_netdev "lan1" "LAN1" "green:lan1" "eth1" ucidef_set_led_netdev "lan1" "LAN1" "green:lan-1" "eth1"
ucidef_set_led_netdev "lan2" "LAN2" "green:lan2" "eth0" ucidef_set_led_netdev "lan2" "LAN2" "green:lan-2" "eth0"
;; ;;
esac esac

9
target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3399-guangmiao-g4c.dts
View File

@ -96,18 +96,21 @@
pinctrl-0 = <&lan_led_pin>, <&status_led_pin>, <&wan_led_pin>; pinctrl-0 = <&lan_led_pin>, <&status_led_pin>, <&wan_led_pin>;
lan_led: led-lan { lan_led: led-lan {
color = <LED_COLOR_ID_GREEN>;
function = LED_FUNCTION_LAN;
gpios = <&gpio0 RK_PA3 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 RK_PA3 GPIO_ACTIVE_HIGH>;
label = "green:lan";
}; };
status_led: led-status { status_led: led-status {
color = <LED_COLOR_ID_GREEN>;
function = LED_FUNCTION_STATUS;
gpios = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>;
label = "green:status";
}; };
wan_led: led-wan { wan_led: led-wan {
color = <LED_COLOR_ID_GREEN>;
function = LED_FUNCTION_WAN;
gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>;
label = "green:wan";
}; };
}; };
}; };

26
target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-mrkaio-m68s.dts
View File

@ -23,18 +23,20 @@
gpio-leds { gpio-leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&power_led_pin>, <&sata_led_pin>; pinctrl-0 = <&disk_led_pin>, <&power_led_pin>;
power_led: led-power { led-disk {
label = "red:power"; color = <LED_COLOR_ID_BLUE>;
gpios = <&gpio4 RK_PC4 GPIO_ACTIVE_HIGH>; function = LED_FUNCTION_DISK;
};
led-sata {
label = "blue:sata";
gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "disk-activity"; linux,default-trigger = "disk-activity";
}; };
power_led: led-power {
color = <LED_COLOR_ID_RED>;
function = LED_FUNCTION_POWER;
gpios = <&gpio4 RK_PC4 GPIO_ACTIVE_HIGH>;
};
}; };
switch_otg: switch-otg-regulator { switch_otg: switch-otg-regulator {
@ -122,12 +124,12 @@
&pinctrl { &pinctrl {
leds { leds {
power_led_pin: power-led-pin { disk_led_pin: disk-led-pin {
rockchip,pins = <4 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <0 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
sata_led_pin: sata-led-pin { power_led_pin: power-led-pin {
rockchip,pins = <0 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <4 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };

5
target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6c.dts
View File

@ -9,11 +9,12 @@
gpio-leds { gpio-leds {
led-lan1 { led-lan1 {
label = "green:lan"; /delete-property/ function-enumerator;
}; };
led-lan2 { led-lan2 {
label = "green:user"; /delete-property/ function-enumerator;
function = LED_FUNCTION_PROGRAMMING;
}; };
}; };
}; };

14
target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6s.dts
View File

@ -54,22 +54,28 @@
pinctrl-0 = <&lan1_led_pin>, <&lan2_led_pin>, <&power_led_pin>, <&wan_led_pin>; pinctrl-0 = <&lan1_led_pin>, <&lan2_led_pin>, <&power_led_pin>, <&wan_led_pin>;
led-lan1 { led-lan1 {
label = "green:lan1"; color = <LED_COLOR_ID_GREEN>;
function = LED_FUNCTION_LAN;
function-enumerator = <1>;
gpios = <&gpio1 RK_PC3 GPIO_ACTIVE_HIGH>; gpios = <&gpio1 RK_PC3 GPIO_ACTIVE_HIGH>;
}; };
led-lan2 { led-lan2 {
label = "green:lan2"; color = <LED_COLOR_ID_GREEN>;
function = LED_FUNCTION_LAN;
function-enumerator = <2>;
gpios = <&gpio1 RK_PC4 GPIO_ACTIVE_HIGH>; gpios = <&gpio1 RK_PC4 GPIO_ACTIVE_HIGH>;
}; };
power_led: led-power { power_led: led-power {
label = "red:power"; color = <LED_COLOR_ID_RED>;
function = LED_FUNCTION_POWER;
gpios = <&gpio1 RK_PC1 GPIO_ACTIVE_HIGH>; gpios = <&gpio1 RK_PC1 GPIO_ACTIVE_HIGH>;
}; };
led-wan { led-wan {
label = "green:wan"; color = <LED_COLOR_ID_GREEN>;
function = LED_FUNCTION_WAN;
gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_HIGH>; gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_HIGH>;
}; };
}; };

124
target/linux/rockchip/patches-6.1/100-rockchip-use-system-LED-for-OpenWrt.patch
View File

@ -56,40 +56,26 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
ethernet1 = &rtl8153; ethernet1 = &rtl8153;
mmc0 = &sdmmc; mmc0 = &sdmmc;
+ +
+ led-boot = &sys_led; + led-boot = &status_led;
+ led-failsafe = &sys_led; + led-failsafe = &status_led;
+ led-running = &sys_led; + led-running = &status_led;
+ led-upgrade = &sys_led; + led-upgrade = &status_led;
}; };
chosen { chosen {
@@ -36,22 +41,18 @@ @@ -41,11 +46,10 @@
pinctrl-names = "default";
led-0 {
- function = LED_FUNCTION_LAN;
- color = <LED_COLOR_ID_GREEN>;
gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>; gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
+ label = "green:lan";
}; };
- led-1 { - led-1 {
- function = LED_FUNCTION_STATUS; + status_led: led-1 {
- color = <LED_COLOR_ID_RED>; function = LED_FUNCTION_STATUS;
+ sys_led: led-1 { color = <LED_COLOR_ID_RED>;
gpios = <&gpio3 RK_PC5 GPIO_ACTIVE_HIGH>; gpios = <&gpio3 RK_PC5 GPIO_ACTIVE_HIGH>;
- linux,default-trigger = "heartbeat"; - linux,default-trigger = "heartbeat";
+ label = "red:sys";
}; };
led-2 { led-2 {
- function = LED_FUNCTION_WAN;
- color = <LED_COLOR_ID_GREEN>;
gpios = <&gpio2 RK_PC2 GPIO_ACTIVE_HIGH>;
+ label = "green:wan";
};
};
--- a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts --- a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts
@@ -13,6 +13,11 @@ @@ -13,6 +13,11 @@
@ -189,13 +175,9 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
chosen: chosen { chosen: chosen {
stdout-path = "serial2:1500000n8"; stdout-path = "serial2:1500000n8";
}; };
@@ -32,10 +39,8 @@ @@ -35,7 +42,6 @@
pinctrl-0 = <&status_led_pin>; color = <LED_COLOR_ID_BLUE>;
function = LED_FUNCTION_STATUS;
status_led: led-status {
- color = <LED_COLOR_ID_BLUE>;
- function = LED_FUNCTION_STATUS;
+ label = "blue:status";
gpios = <&gpio0 RK_PC0 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 RK_PC0 GPIO_ACTIVE_HIGH>;
- linux,default-trigger = "heartbeat"; - linux,default-trigger = "heartbeat";
}; };
@ -203,74 +185,24 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
--- a/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5c.dts --- a/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5c.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5c.dts +++ b/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5c.dts
@@ -32,27 +32,22 @@ @@ -40,7 +40,6 @@
pinctrl-0 = <&lan_led_pin>, <&power_led_pin>, <&wan_led_pin>, <&wlan_led_pin>;
led-lan {
- color = <LED_COLOR_ID_GREEN>;
- function = LED_FUNCTION_LAN;
+ label = "green:lan";
gpios = <&gpio3 RK_PA3 GPIO_ACTIVE_HIGH>;
};
power_led: led-power { power_led: led-power {
- color = <LED_COLOR_ID_RED>; color = <LED_COLOR_ID_RED>;
- function = LED_FUNCTION_POWER; function = LED_FUNCTION_POWER;
- linux,default-trigger = "heartbeat"; - linux,default-trigger = "heartbeat";
+ label = "red:power";
gpios = <&gpio3 RK_PA2 GPIO_ACTIVE_HIGH>; gpios = <&gpio3 RK_PA2 GPIO_ACTIVE_HIGH>;
}; };
led-wan {
- color = <LED_COLOR_ID_GREEN>;
- function = LED_FUNCTION_WAN;
+ label = "green:wan";
gpios = <&gpio3 RK_PA4 GPIO_ACTIVE_HIGH>;
};
led-wlan {
- color = <LED_COLOR_ID_GREEN>;
- function = LED_FUNCTION_WLAN;
+ label = "green:wlan";
gpios = <&gpio3 RK_PA5 GPIO_ACTIVE_HIGH>;
};
};
--- a/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts --- a/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts
@@ -23,29 +23,22 @@ @@ -39,7 +39,6 @@
pinctrl-0 = <&lan1_led_pin>, <&lan2_led_pin>, <&power_led_pin>, <&wan_led_pin>;
led-lan1 {
- color = <LED_COLOR_ID_GREEN>;
- function = LED_FUNCTION_LAN;
- function-enumerator = <1>;
+ label = "green:lan1";
gpios = <&gpio3 RK_PD6 GPIO_ACTIVE_HIGH>;
};
led-lan2 {
- color = <LED_COLOR_ID_GREEN>;
- function = LED_FUNCTION_LAN;
- function-enumerator = <2>;
+ label = "green:lan2";
gpios = <&gpio3 RK_PD7 GPIO_ACTIVE_HIGH>;
};
power_led: led-power { power_led: led-power {
- color = <LED_COLOR_ID_RED>; color = <LED_COLOR_ID_RED>;
- function = LED_FUNCTION_POWER; function = LED_FUNCTION_POWER;
- linux,default-trigger = "heartbeat"; - linux,default-trigger = "heartbeat";
+ label = "red:power";
gpios = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>; gpios = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>;
}; };
led-wan {
- color = <LED_COLOR_ID_GREEN>;
- function = LED_FUNCTION_WAN;
+ label = "green:wan";
gpios = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;
};
};
--- a/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi --- a/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi
@@ -18,6 +18,11 @@ @@ -18,6 +18,11 @@
@ -350,7 +282,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
}; };
chosen { chosen {
@@ -28,20 +33,17 @@ @@ -28,20 +33,19 @@
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
@ -358,7 +290,8 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
+ pinctrl-0 = <&sys_led_pin>, <&usr_led_pin>; + pinctrl-0 = <&sys_led_pin>, <&usr_led_pin>;
sys_led: led-0 { sys_led: led-0 {
+ label = "red:system"; + color = <LED_COLOR_ID_RED>;
+ function = LED_FUNCTION_SYSTEM;
gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>; gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
- label = "system-led"; - label = "system-led";
- linux,default-trigger = "heartbeat"; - linux,default-trigger = "heartbeat";
@ -367,7 +300,8 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
}; };
usr_led: led-1 { usr_led: led-1 {
+ label = "green:wan"; + color = <LED_COLOR_ID_GREEN>;
+ function = LED_FUNCTION_WAN;
gpios = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>; gpios = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>;
- label = "user-led"; - label = "user-led";
- pinctrl-names = "default"; - pinctrl-names = "default";
@ -412,15 +346,14 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
}; };
chosen { chosen {
@@ -43,11 +48,9 @@ @@ -43,11 +48,10 @@
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&led_rgb_b>; pinctrl-0 = <&led_rgb_b>;
- led_rgb_b { - led_rgb_b {
- function = LED_FUNCTION_STATUS;
- color = <LED_COLOR_ID_BLUE>;
+ status_led: led_rgb_b { + status_led: led_rgb_b {
+ label = "blue:status"; function = LED_FUNCTION_STATUS;
color = <LED_COLOR_ID_BLUE>;
gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;
- linux,default-trigger = "heartbeat"; - linux,default-trigger = "heartbeat";
}; };
@ -479,15 +412,14 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
}; };
analog-sound { analog-sound {
@@ -40,11 +45,9 @@ @@ -40,11 +45,10 @@
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&io_led>; pinctrl-0 = <&io_led>;
- io-led { - io-led {
- color = <LED_COLOR_ID_BLUE>;
- function = LED_FUNCTION_STATUS;
+ status_led: io-led { + status_led: io-led {
+ label = "blue:status"; color = <LED_COLOR_ID_BLUE>;
function = LED_FUNCTION_STATUS;
gpios = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>; gpios = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>;
- linux,default-trigger = "heartbeat"; - linux,default-trigger = "heartbeat";
}; };

12
target/linux/rockchip/patches-6.1/103-arm64-dts-rockchip-lower-mmc-speed.patch
View File

@ -36,7 +36,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
}; };
--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts --- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts
@@ -560,8 +560,7 @@ @@ -562,8 +562,7 @@
no-sd; no-sd;
non-removable; non-removable;
max-frequency = <200000000>; max-frequency = <200000000>;
@ -46,7 +46,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
status = "okay"; status = "okay";
}; };
@@ -572,7 +571,7 @@ @@ -574,7 +573,7 @@
disable-wp; disable-wp;
no-mmc; no-mmc;
no-sdio; no-sdio;
@ -57,7 +57,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
status = "okay"; status = "okay";
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
@@ -371,8 +371,7 @@ @@ -372,8 +372,7 @@
no-sd; no-sd;
non-removable; non-removable;
max-frequency = <200000000>; max-frequency = <200000000>;
@ -67,7 +67,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
status = "okay"; status = "okay";
}; };
@@ -383,9 +382,8 @@ @@ -384,9 +383,8 @@
bus-width = <4>; bus-width = <4>;
cap-mmc-highspeed; cap-mmc-highspeed;
cap-sd-highspeed; cap-sd-highspeed;
@ -80,7 +80,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
status = "okay"; status = "okay";
--- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts --- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
@@ -361,8 +361,7 @@ @@ -362,8 +362,7 @@
no-sd; no-sd;
non-removable; non-removable;
max-frequency = <200000000>; max-frequency = <200000000>;
@ -90,7 +90,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
status = "okay"; status = "okay";
}; };
@@ -370,12 +369,11 @@ @@ -371,12 +370,11 @@
bus-width = <4>; bus-width = <4>;
cap-mmc-highspeed; cap-mmc-highspeed;
cap-sd-highspeed; cap-sd-highspeed;

6
target/linux/rockchip/patches-6.1/113-01-usb-dwc3-add-optional-PHY-interface-clocks.patch
View File

@ -15,7 +15,7 @@ Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
--- a/drivers/usb/dwc3/core.c --- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c
@@ -858,8 +858,20 @@ static int dwc3_clk_enable(struct dwc3 * @@ -821,8 +821,20 @@ static int dwc3_clk_enable(struct dwc3 *
if (ret) if (ret)
goto disable_ref_clk; goto disable_ref_clk;
@ -36,7 +36,7 @@ Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
disable_ref_clk: disable_ref_clk:
clk_disable_unprepare(dwc->ref_clk); clk_disable_unprepare(dwc->ref_clk);
disable_bus_clk: disable_bus_clk:
@@ -869,6 +881,8 @@ disable_bus_clk: @@ -832,6 +844,8 @@ disable_bus_clk:
static void dwc3_clk_disable(struct dwc3 *dwc) static void dwc3_clk_disable(struct dwc3 *dwc)
{ {
@ -45,7 +45,7 @@ Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
clk_disable_unprepare(dwc->susp_clk); clk_disable_unprepare(dwc->susp_clk);
clk_disable_unprepare(dwc->ref_clk); clk_disable_unprepare(dwc->ref_clk);
clk_disable_unprepare(dwc->bus_clk); clk_disable_unprepare(dwc->bus_clk);
@@ -1963,6 +1977,18 @@ static int dwc3_probe(struct platform_de @@ -1926,6 +1940,18 @@ static int dwc3_probe(struct platform_de
goto put_usb_psy; goto put_usb_psy;
} }
} }

2
target/linux/rockchip/patches-6.1/122-02-arm64-dts-rockchip-rock5a-add-cpu-mem-regulator-info.patch
View File

@ -13,7 +13,7 @@ Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
--- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts --- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
@@ -123,34 +123,42 @@ @@ -124,34 +124,42 @@
&cpu_b0 { &cpu_b0 {
cpu-supply = <&vdd_cpu_big0_s0>; cpu-supply = <&vdd_cpu_big0_s0>;

6
target/linux/rockchip/patches-6.1/122-03-arm64-dts-rockchip-rk3588s-rock5a-add-upper-USB3-port.patch
View File

@ -13,7 +13,7 @@ Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
--- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts --- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
@@ -708,6 +708,14 @@ @@ -709,6 +709,14 @@
}; };
}; };
@ -28,7 +28,7 @@ Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
&u2phy2 { &u2phy2 {
status = "okay"; status = "okay";
}; };
@@ -731,6 +739,15 @@ @@ -732,6 +740,15 @@
status = "okay"; status = "okay";
}; };
@ -44,7 +44,7 @@ Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
&usb_host0_ehci { &usb_host0_ehci {
status = "okay"; status = "okay";
pinctrl-names = "default"; pinctrl-names = "default";
@@ -741,6 +758,11 @@ @@ -742,6 +759,11 @@
status = "okay"; status = "okay";
}; };

2
target/linux/rockchip/patches-6.1/123-05-arm64-dts-rockchip-rock5b-add-cpu-mem-regulator-info.patch
View File

@ -13,7 +13,7 @@ Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
@@ -154,34 +154,42 @@ @@ -155,34 +155,42 @@
&cpu_b0 { &cpu_b0 {
cpu-supply = <&vdd_cpu_big0_s0>; cpu-supply = <&vdd_cpu_big0_s0>;

6
target/linux/rockchip/patches-6.1/123-06-arm64-dts-rockchip-rk3588-rock5b-add-lower-USB3-port.patch
View File

@ -13,7 +13,7 @@ Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
@@ -755,6 +755,14 @@ @@ -756,6 +756,14 @@
status = "okay"; status = "okay";
}; };
@ -28,7 +28,7 @@ Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
&u2phy2 { &u2phy2 {
status = "okay"; status = "okay";
}; };
@@ -774,6 +782,14 @@ @@ -775,6 +783,14 @@
status = "okay"; status = "okay";
}; };
@ -43,7 +43,7 @@ Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
&usb_host0_ehci { &usb_host0_ehci {
status = "okay"; status = "okay";
}; };
@@ -790,6 +806,10 @@ @@ -791,6 +807,10 @@
status = "okay"; status = "okay";
}; };

14
target/linux/rockchip/patches-6.1/123-07-arm64-dts-rockchip-rk3588-rock5b-add-USB-C-support.patch
View File

@ -21,7 +21,7 @@ Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
#include "rk3588.dtsi" #include "rk3588.dtsi"
/ { / {
@@ -69,6 +70,15 @@ @@ -70,6 +71,15 @@
shutdown-gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>; shutdown-gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>;
}; };
@ -37,7 +37,7 @@ Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
vcc3v3_pcie2x1l0: vcc3v3-pcie2x1l0-regulator { vcc3v3_pcie2x1l0: vcc3v3-pcie2x1l0-regulator {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
@@ -127,6 +137,7 @@ @@ -128,6 +138,7 @@
regulator-boot-on; regulator-boot-on;
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
@ -45,7 +45,7 @@ Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
}; };
vcc_1v1_nldo_s3: vcc-1v1-nldo-s3-regulator { vcc_1v1_nldo_s3: vcc-1v1-nldo-s3-regulator {
@@ -232,6 +243,61 @@ @@ -233,6 +244,61 @@
}; };
}; };
@ -107,7 +107,7 @@ Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
&i2c6 { &i2c6 {
status = "okay"; status = "okay";
@@ -361,6 +427,10 @@ @@ -362,6 +428,10 @@
vcc5v0_host_en: vcc5v0-host-en { vcc5v0_host_en: vcc5v0-host-en {
rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
@ -118,7 +118,7 @@ Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
}; };
}; };
@@ -755,6 +825,14 @@ @@ -756,6 +826,14 @@
status = "okay"; status = "okay";
}; };
@ -133,7 +133,7 @@ Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
&u2phy1 { &u2phy1 {
status = "okay"; status = "okay";
}; };
@@ -790,6 +868,33 @@ @@ -791,6 +869,33 @@
status = "okay"; status = "okay";
}; };
@ -167,7 +167,7 @@ Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
&usb_host0_ehci { &usb_host0_ehci {
status = "okay"; status = "okay";
}; };
@@ -798,6 +903,20 @@ @@ -799,6 +904,20 @@
status = "okay"; status = "okay";
}; };

2
target/linux/rockchip/patches-6.1/124-01-arm64-dts-rockchip-nanopc-t6-cpu-mem-regulator-info.patch
View File

@ -1,6 +1,6 @@
--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts --- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts
@@ -201,34 +201,42 @@ @@ -203,34 +203,42 @@
&cpu_l0 { &cpu_l0 {
cpu-supply = <&vdd_cpu_lit_s0>; cpu-supply = <&vdd_cpu_lit_s0>;

12
target/linux/rockchip/patches-6.1/124-02-arm64-dts-rockchip-nanopc-t6-add-lower-USB3-port.patch
View File

@ -1,6 +1,6 @@
--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts --- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts
@@ -107,6 +107,28 @@ @@ -109,6 +109,28 @@
vin-supply = <&vcc12v_dcin>; vin-supply = <&vcc12v_dcin>;
}; };
@ -29,7 +29,7 @@
vcc_1v1_nldo_s3: vcc-1v1-nldo-s3-regulator { vcc_1v1_nldo_s3: vcc-1v1-nldo-s3-regulator {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "vcc-1v1-nldo-s3"; regulator-name = "vcc-1v1-nldo-s3";
@@ -549,6 +571,10 @@ @@ -551,6 +573,10 @@
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>;
}; };
@ -40,7 +40,7 @@
}; };
}; };
@@ -920,6 +946,11 @@ @@ -922,6 +948,11 @@
status = "okay"; status = "okay";
}; };
@ -52,7 +52,7 @@
&u2phy2_host { &u2phy2_host {
phy-supply = <&vdd_4g_3v3>; phy-supply = <&vdd_4g_3v3>;
status = "okay"; status = "okay";
@@ -929,6 +960,10 @@ @@ -931,6 +962,10 @@
status = "okay"; status = "okay";
}; };
@ -63,7 +63,7 @@
&u2phy2 { &u2phy2 {
status = "okay"; status = "okay";
}; };
@@ -937,6 +972,14 @@ @@ -939,6 +974,14 @@
status = "okay"; status = "okay";
}; };
@ -78,7 +78,7 @@
&usb_host0_ehci { &usb_host0_ehci {
status = "okay"; status = "okay";
}; };
@@ -952,3 +995,7 @@ @@ -954,3 +997,7 @@
&usb_host1_ohci { &usb_host1_ohci {
status = "okay"; status = "okay";
}; };

10
target/linux/rockchip/patches-6.1/124-03-arm64-dts-rockchip-nanopc-t6-add-USB-C-support.patch
View File

@ -1,6 +1,6 @@
--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts --- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts
@@ -419,6 +419,48 @@ @@ -421,6 +421,48 @@
source-pdos = <PDO_FIXED(5000, 2000, PDO_FIXED_USB_COMM)>; source-pdos = <PDO_FIXED(5000, 2000, PDO_FIXED_USB_COMM)>;
sink-pdos = <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>; sink-pdos = <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>;
op-sink-microwatt = <1000000>; op-sink-microwatt = <1000000>;
@ -49,7 +49,7 @@
}; };
}; };
@@ -946,6 +988,10 @@ @@ -948,6 +990,10 @@
status = "okay"; status = "okay";
}; };
@ -60,7 +60,7 @@
&u2phy1_otg { &u2phy1_otg {
phy-supply = <&vcc5v0_host_30>; phy-supply = <&vcc5v0_host_30>;
status = "okay"; status = "okay";
@@ -960,6 +1006,10 @@ @@ -962,6 +1008,10 @@
status = "okay"; status = "okay";
}; };
@ -71,7 +71,7 @@
&u2phy1 { &u2phy1 {
status = "okay"; status = "okay";
}; };
@@ -972,6 +1022,33 @@ @@ -974,6 +1024,33 @@
status = "okay"; status = "okay";
}; };
@ -105,7 +105,7 @@
&usbdp_phy1 { &usbdp_phy1 {
status = "okay"; status = "okay";
}; };
@@ -988,6 +1065,21 @@ @@ -990,6 +1067,21 @@
status = "okay"; status = "okay";
}; };

4
target/linux/rockchip/patches-6.1/603-net-ethernet-stmmac-add-devname-configuration-from-OF.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -7114,6 +7114,7 @@ int stmmac_dvr_probe(struct device *devi @@ -7115,6 +7115,7 @@ int stmmac_dvr_probe(struct device *devi
{ {
struct net_device *ndev = NULL; struct net_device *ndev = NULL;
struct stmmac_priv *priv; struct stmmac_priv *priv;
@ -8,7 +8,7 @@
u32 rxq; u32 rxq;
int i, ret = 0; int i, ret = 0;
@@ -7122,6 +7123,9 @@ int stmmac_dvr_probe(struct device *devi @@ -7123,6 +7124,9 @@ int stmmac_dvr_probe(struct device *devi
if (!ndev) if (!ndev)
return -ENOMEM; return -ENOMEM;

8
target/linux/rockchip/patches-6.1/610-arm64-rockchip-add-OF-node-for-eth.patch
View File

@ -48,7 +48,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
--- a/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts --- a/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts
@@ -359,9 +359,11 @@ @@ -362,9 +362,11 @@
#size-cells = <0>; #size-cells = <0>;
/* Second port is for USB 3.0 */ /* Second port is for USB 3.0 */
@ -166,7 +166,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
--- a/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts --- a/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts
@@ -72,6 +72,7 @@ @@ -78,6 +78,7 @@
reg = <1>; reg = <1>;
pinctrl-0 = <&eth_phy0_reset_pin>; pinctrl-0 = <&eth_phy0_reset_pin>;
pinctrl-names = "default"; pinctrl-names = "default";
@ -176,7 +176,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts --- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts
@@ -528,6 +528,17 @@ @@ -530,6 +530,17 @@
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pcie2_0_rst>; pinctrl-0 = <&pcie2_0_rst>;
status = "okay"; status = "okay";
@ -194,7 +194,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
}; };
&pcie2x1l1 { &pcie2x1l1 {
@@ -544,6 +555,17 @@ @@ -546,6 +557,17 @@
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pcie2_2_rst>; pinctrl-0 = <&pcie2_2_rst>;
status = "okay"; status = "okay";

8
target/linux/rockchip/patches-6.1/801-07-arm64-dts-rockchip-enable-hwrng-for-rockchip-boards.patch
View File

@ -13,7 +13,7 @@
status = "okay"; status = "okay";
--- a/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi --- a/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi
@@ -423,6 +423,10 @@ @@ -424,6 +424,10 @@
status = "okay"; status = "okay";
}; };
@ -52,7 +52,7 @@
status = "okay"; status = "okay";
--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts --- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts
@@ -647,6 +647,10 @@ @@ -649,6 +649,10 @@
status = "okay"; status = "okay";
}; };
@ -65,7 +65,7 @@
status = "okay"; status = "okay";
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
@@ -438,6 +438,10 @@ @@ -439,6 +439,10 @@
status = "okay"; status = "okay";
}; };
@ -78,7 +78,7 @@
status = "okay"; status = "okay";
--- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts --- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
@@ -358,6 +358,10 @@ @@ -359,6 +359,10 @@
status = "okay"; status = "okay";
}; };

6
target/linux/rockchip/patches-6.1/806-arm64-dts-rockchip-enable-dmc-for-rk3328-boards.patch
View File

@ -46,7 +46,7 @@ Signed-off-by: hmz007 <hmz007@gmail.com>
regulator-ramp-delay = <12500>; regulator-ramp-delay = <12500>;
--- a/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts --- a/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts
@@ -108,6 +108,11 @@ @@ -111,6 +111,11 @@
status = "disabled"; status = "disabled";
}; };
@ -58,7 +58,7 @@ Signed-off-by: hmz007 <hmz007@gmail.com>
&gmac2io { &gmac2io {
assigned-clocks = <&cru SCLK_MAC2IO>, <&cru SCLK_MAC2IO_EXT>; assigned-clocks = <&cru SCLK_MAC2IO>, <&cru SCLK_MAC2IO_EXT>;
assigned-clock-parents = <&gmac_clk>, <&gmac_clk>; assigned-clock-parents = <&gmac_clk>, <&gmac_clk>;
@@ -167,6 +172,7 @@ @@ -170,6 +175,7 @@
regulator-name = "vdd_log"; regulator-name = "vdd_log";
regulator-always-on; regulator-always-on;
regulator-boot-on; regulator-boot-on;
@ -66,7 +66,7 @@ Signed-off-by: hmz007 <hmz007@gmail.com>
regulator-min-microvolt = <712500>; regulator-min-microvolt = <712500>;
regulator-max-microvolt = <1450000>; regulator-max-microvolt = <1450000>;
regulator-ramp-delay = <12500>; regulator-ramp-delay = <12500>;
@@ -181,6 +187,7 @@ @@ -184,6 +190,7 @@
regulator-name = "vdd_arm"; regulator-name = "vdd_arm";
regulator-always-on; regulator-always-on;
regulator-boot-on; regulator-boot-on;