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

rockchip: add more missing LED bindings

Browse Source 
Fixes: bdff7b7758 ("rockchip: remove LED label hack")
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2024-02-13 13:35:53 +08:00
parent e6fdab97ca
commit 46fd3bd024
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
10 changed files with 51 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,15 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
--- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts --- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts
@@ -16,6 +16,11 @@ @@ -6,6 +6,7 @@
/dts-v1/;
#include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
#include <dt-bindings/gpio/gpio.h>
#include "rk3328.dtsi"
@@ -16,6 +17,11 @@
aliases { aliases {
ethernet1 = &rtl8153; ethernet1 = &rtl8153;
mmc0 = &sdmmc; mmc0 = &sdmmc;
@ -27,25 +35,29 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
}; };
chosen { chosen {
@@ -49,18 +54,18 @@ @@ -48,19 +54,22 @@
pinctrl-names = "default";
lan_led: led-0 { lan_led: led-0 {
+ color = <LED_COLOR_ID_GREEN>;
+ function = LED_FUNCTION_LAN;
gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>; gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
- label = "nanopi-r2s:green:lan"; - label = "nanopi-r2s:green:lan";
+ label = "green:lan";
}; };
sys_led: led-1 { sys_led: led-1 {
+ color = <LED_COLOR_ID_RED>;
+ function = LED_FUNCTION_STATUS;
gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>;
- label = "nanopi-r2s:red:sys"; - label = "nanopi-r2s:red:sys";
+ label = "red:sys";
default-state = "on"; default-state = "on";
}; };
wan_led: led-2 { wan_led: led-2 {
+ color = <LED_COLOR_ID_GREEN>;
+ function = LED_FUNCTION_WAN;
gpios = <&gpio2 RK_PC2 GPIO_ACTIVE_HIGH>; gpios = <&gpio2 RK_PC2 GPIO_ACTIVE_HIGH>;
- label = "nanopi-r2s:green:wan"; - label = "nanopi-r2s:green:wan";
+ label = "green:wan";
}; };
}; };
@ -270,7 +282,15 @@ 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
@@ -20,6 +20,11 @@ @@ -8,6 +8,7 @@
/dts-v1/;
#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/leds/common.h>
#include <dt-bindings/pinctrl/rockchip.h>
#include <dt-bindings/usb/pd.h>
#include "rk3588.dtsi"
@@ -20,6 +21,11 @@
mmc0 = &sdhci; mmc0 = &sdhci;
mmc1 = &sdmmc; mmc1 = &sdmmc;
serial2 = &uart2; serial2 = &uart2;
@ -282,7 +302,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
}; };
chosen { chosen {
@@ -28,20 +33,19 @@ @@ -28,20 +34,19 @@
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
@ -291,7 +311,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
sys_led: led-0 { sys_led: led-0 {
+ color = <LED_COLOR_ID_RED>; + color = <LED_COLOR_ID_RED>;
+ function = LED_FUNCTION_SYSTEM; + function = LED_FUNCTION_STATUS;
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";

2
target/linux/rockchip/patches-6.1/101-rockchip-rk3328-add-compatible-to-NanoPi-R2S-etherne.patch
View File

@ -14,7 +14,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
--- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts --- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts
@@ -161,6 +161,8 @@ @@ -165,6 +165,8 @@
#size-cells = <0>; #size-cells = <0>;
rtl8211e: ethernet-phy@1 { rtl8211e: ethernet-phy@1 {

2
target/linux/rockchip/patches-6.1/102-rockchip-rk3328-add-i2c0-controller-for-nanopi-r2s.patch
View File

@ -9,7 +9,7 @@ Subject: [PATCH] rockchip: rk3328: add i2c0 controller for nanopi r2s
--- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts --- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts
@@ -173,6 +173,10 @@ @@ -177,6 +177,10 @@
}; };
}; };

4
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
@@ -562,8 +562,7 @@ @@ -563,8 +563,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";
}; };
@@ -574,7 +573,7 @@ @@ -575,7 +574,7 @@
disable-wp; disable-wp;
no-mmc; no-mmc;
no-sdio; no-sdio;

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
@@ -203,34 +203,42 @@ @@ -204,34 +204,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
@@ -109,6 +109,28 @@ @@ -110,6 +110,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";
@@ -551,6 +573,10 @@ @@ -552,6 +574,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 @@
}; };
}; };
@@ -922,6 +948,11 @@ @@ -923,6 +949,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";
@@ -931,6 +962,10 @@ @@ -932,6 +963,10 @@
status = "okay"; status = "okay";
}; };
@ -63,7 +63,7 @@
&u2phy2 { &u2phy2 {
status = "okay"; status = "okay";
}; };
@@ -939,6 +974,14 @@ @@ -940,6 +975,14 @@
status = "okay"; status = "okay";
}; };
@ -78,7 +78,7 @@
&usb_host0_ehci { &usb_host0_ehci {
status = "okay"; status = "okay";
}; };
@@ -954,3 +997,7 @@ @@ -955,3 +998,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
@@ -421,6 +421,48 @@ @@ -422,6 +422,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 @@
}; };
}; };
@@ -948,6 +990,10 @@ @@ -949,6 +991,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";
@@ -962,6 +1008,10 @@ @@ -963,6 +1009,10 @@
status = "okay"; status = "okay";
}; };
@ -71,7 +71,7 @@
&u2phy1 { &u2phy1 {
status = "okay"; status = "okay";
}; };
@@ -974,6 +1024,33 @@ @@ -975,6 +1025,33 @@
status = "okay"; status = "okay";
}; };
@ -105,7 +105,7 @@
&usbdp_phy1 { &usbdp_phy1 {
status = "okay"; status = "okay";
}; };
@@ -990,6 +1067,21 @@ @@ -991,6 +1068,21 @@
status = "okay"; status = "okay";
}; };

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

@ -32,7 +32,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
+}; +};
--- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts --- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts
@@ -405,9 +405,11 @@ @@ -409,9 +409,11 @@
#size-cells = <0>; #size-cells = <0>;
/* Second port is for USB 3.0 */ /* Second port is for USB 3.0 */
@ -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
@@ -530,6 +530,17 @@ @@ -531,6 +531,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 {
@@ -546,6 +557,17 @@ @@ -547,6 +558,17 @@
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pcie2_2_rst>; pinctrl-0 = <&pcie2_2_rst>;
status = "okay"; status = "okay";

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

@ -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
@@ -649,6 +649,10 @@ @@ -650,6 +650,10 @@
status = "okay"; status = "okay";
}; };

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

@ -16,7 +16,7 @@ Signed-off-by: hmz007 <hmz007@gmail.com>
--- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts --- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts
@@ -141,6 +141,11 @@ @@ -145,6 +145,11 @@
status = "disabled"; status = "disabled";
}; };
@ -28,7 +28,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>;
@@ -206,6 +211,7 @@ @@ -210,6 +215,7 @@
regulator-name = "vdd_log"; regulator-name = "vdd_log";
regulator-always-on; regulator-always-on;
regulator-boot-on; regulator-boot-on;
@ -36,7 +36,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>;
@@ -220,6 +226,7 @@ @@ -224,6 +230,7 @@
regulator-name = "vdd_arm"; regulator-name = "vdd_arm";
regulator-always-on; regulator-always-on;
regulator-boot-on; regulator-boot-on;