[PATCH 1/2] configs: rockchip: enable gpio-leds driver for Radxa boards
Basically, Radxa's boards are intended to turn LEDs on at U-Boot. enable gpio-leds driver and led command.
Signed-off-by: FUKAUMI Naoki naoki@radxa.com --- configs/radxa-cm3-io-rk3566_defconfig | 2 ++ configs/radxa-e25-rk3568_defconfig | 2 ++ configs/rock-3a-rk3568_defconfig | 2 ++ configs/rock-4c-plus-rk3399_defconfig | 2 ++ configs/rock-4se-rk3399_defconfig | 2 ++ configs/rock-pi-4-rk3399_defconfig | 2 ++ configs/rock-pi-4c-rk3399_defconfig | 2 ++ configs/rock-pi-e-rk3328_defconfig | 2 ++ configs/rock-pi-e-v3-rk3328_defconfig | 2 ++ configs/rock-pi-s-rk3308_defconfig | 2 ++ configs/rock5a-rk3588s_defconfig | 2 ++ configs/rock5b-rk3588_defconfig | 2 ++ 12 files changed, 24 insertions(+)
diff --git a/configs/radxa-cm3-io-rk3566_defconfig b/configs/radxa-cm3-io-rk3566_defconfig index 48c8fcf5a66..9d8a59dfcbf 100644 --- a/configs/radxa-cm3-io-rk3566_defconfig +++ b/configs/radxa-cm3-io-rk3566_defconfig @@ -39,6 +39,8 @@ CONFIG_SPL_SYSCON=y CONFIG_SPL_CLK=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_LED=y +CONFIG_LED_GPIO=y CONFIG_MISC=y CONFIG_SUPPORT_EMMC_RPMB=y CONFIG_MMC_DW=y diff --git a/configs/radxa-e25-rk3568_defconfig b/configs/radxa-e25-rk3568_defconfig index 496fee0e0a4..314c3e18908 100644 --- a/configs/radxa-e25-rk3568_defconfig +++ b/configs/radxa-e25-rk3568_defconfig @@ -44,6 +44,8 @@ CONFIG_DWC_AHCI=y CONFIG_SPL_CLK=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_LED=y +CONFIG_LED_GPIO=y CONFIG_MISC=y CONFIG_SUPPORT_EMMC_RPMB=y CONFIG_MMC_DW=y diff --git a/configs/rock-3a-rk3568_defconfig b/configs/rock-3a-rk3568_defconfig index 66ac2f6d7aa..f07ae545ac5 100644 --- a/configs/rock-3a-rk3568_defconfig +++ b/configs/rock-3a-rk3568_defconfig @@ -52,6 +52,8 @@ CONFIG_AHCI_PCI=y CONFIG_SPL_CLK=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_LED=y +CONFIG_LED_GPIO=y CONFIG_MISC=y CONFIG_SUPPORT_EMMC_RPMB=y CONFIG_MMC_DW=y diff --git a/configs/rock-4c-plus-rk3399_defconfig b/configs/rock-4c-plus-rk3399_defconfig index 80dc44986e7..018926cead8 100644 --- a/configs/rock-4c-plus-rk3399_defconfig +++ b/configs/rock-4c-plus-rk3399_defconfig @@ -44,6 +44,8 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DFU_MMC=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_LED=y +CONFIG_LED_GPIO=y CONFIG_ROCKCHIP_IODOMAIN=y CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y diff --git a/configs/rock-4se-rk3399_defconfig b/configs/rock-4se-rk3399_defconfig index f52d4bf9913..4a31bc3cc58 100644 --- a/configs/rock-4se-rk3399_defconfig +++ b/configs/rock-4se-rk3399_defconfig @@ -48,6 +48,8 @@ CONFIG_AHCI_PCI=y CONFIG_DFU_MMC=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_LED=y +CONFIG_LED_GPIO=y CONFIG_ROCKCHIP_IODOMAIN=y CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y diff --git a/configs/rock-pi-4-rk3399_defconfig b/configs/rock-pi-4-rk3399_defconfig index e71c4588b94..95a60335a43 100644 --- a/configs/rock-pi-4-rk3399_defconfig +++ b/configs/rock-pi-4-rk3399_defconfig @@ -49,6 +49,8 @@ CONFIG_AHCI_PCI=y CONFIG_DFU_MMC=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_LED=y +CONFIG_LED_GPIO=y CONFIG_ROCKCHIP_IODOMAIN=y CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y diff --git a/configs/rock-pi-4c-rk3399_defconfig b/configs/rock-pi-4c-rk3399_defconfig index 14373933a34..9a03474a22a 100644 --- a/configs/rock-pi-4c-rk3399_defconfig +++ b/configs/rock-pi-4c-rk3399_defconfig @@ -49,6 +49,8 @@ CONFIG_AHCI_PCI=y CONFIG_DFU_MMC=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_LED=y +CONFIG_LED_GPIO=y CONFIG_ROCKCHIP_IODOMAIN=y CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y diff --git a/configs/rock-pi-e-rk3328_defconfig b/configs/rock-pi-e-rk3328_defconfig index 5cc54af3ca5..9d4b2c32971 100644 --- a/configs/rock-pi-e-rk3328_defconfig +++ b/configs/rock-pi-e-rk3328_defconfig @@ -53,6 +53,8 @@ CONFIG_CLK=y CONFIG_SPL_CLK=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_LED=y +CONFIG_LED_GPIO=y CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_PHY_REALTEK=y diff --git a/configs/rock-pi-e-v3-rk3328_defconfig b/configs/rock-pi-e-v3-rk3328_defconfig index 4c6cc634bd6..c82baceedfe 100644 --- a/configs/rock-pi-e-v3-rk3328_defconfig +++ b/configs/rock-pi-e-v3-rk3328_defconfig @@ -54,6 +54,8 @@ CONFIG_CLK=y CONFIG_SPL_CLK=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_LED=y +CONFIG_LED_GPIO=y CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_PHY_REALTEK=y diff --git a/configs/rock-pi-s-rk3308_defconfig b/configs/rock-pi-s-rk3308_defconfig index e450a061802..de45d295fd5 100644 --- a/configs/rock-pi-s-rk3308_defconfig +++ b/configs/rock-pi-s-rk3308_defconfig @@ -38,6 +38,8 @@ CONFIG_CLK=y # CONFIG_USB_FUNCTION_FASTBOOT is not set CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_LED=y +CONFIG_LED_GPIO=y CONFIG_SUPPORT_EMMC_RPMB=y CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y diff --git a/configs/rock5a-rk3588s_defconfig b/configs/rock5a-rk3588s_defconfig index c09e6655f02..6017a1cfecf 100644 --- a/configs/rock5a-rk3588s_defconfig +++ b/configs/rock5a-rk3588s_defconfig @@ -39,6 +39,8 @@ CONFIG_SPL_SYSCON=y CONFIG_SPL_CLK=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_LED=y +CONFIG_LED_GPIO=y CONFIG_MISC=y CONFIG_SUPPORT_EMMC_RPMB=y CONFIG_MMC_DW=y diff --git a/configs/rock5b-rk3588_defconfig b/configs/rock5b-rk3588_defconfig index fc118cea7ba..c664999626b 100644 --- a/configs/rock5b-rk3588_defconfig +++ b/configs/rock5b-rk3588_defconfig @@ -54,6 +54,8 @@ CONFIG_SPL_CLK=y # CONFIG_USB_FUNCTION_FASTBOOT is not set CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_LED=y +CONFIG_LED_GPIO=y CONFIG_MISC=y CONFIG_SUPPORT_EMMC_RPMB=y CONFIG_MMC_DW=y
Basically, Radxa's boards are intended to turn LEDs on at U-Boot. add `default-state = "on"` to u-boot.dtsi.
Signed-off-by: FUKAUMI Naoki naoki@radxa.com --- .../arm/dts/rk3328-rock-pi-e-base-u-boot.dtsi | 6 +++++ arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi | 25 ++++++++++++++++++- arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi | 8 ++++++ arch/arm/dts/rk3566-radxa-cm3-io-u-boot.dtsi | 8 ++++++ arch/arm/dts/rk3568-radxa-e25-u-boot.dtsi | 23 +++++++++++++++++ arch/arm/dts/rk3568-rock-3a-u-boot.dtsi | 8 ++++++ arch/arm/dts/rk3588-rock-5b-u-boot.dtsi | 8 ++++++ arch/arm/dts/rk3588s-rock-5a-u-boot.dtsi | 8 ++++++ 8 files changed, 93 insertions(+), 1 deletion(-)
diff --git a/arch/arm/dts/rk3328-rock-pi-e-base-u-boot.dtsi b/arch/arm/dts/rk3328-rock-pi-e-base-u-boot.dtsi index 39bb66c4fcb..a30adb0be98 100644 --- a/arch/arm/dts/rk3328-rock-pi-e-base-u-boot.dtsi +++ b/arch/arm/dts/rk3328-rock-pi-e-base-u-boot.dtsi @@ -6,6 +6,12 @@ #include "rk3328-u-boot.dtsi"
/ { + leds { + led-0 { + default-state = "on"; + }; + }; + smbios { compatible = "u-boot,sysinfo-smbios";
diff --git a/arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi b/arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi index 5ec15a845c1..614e4ce0fa8 100644 --- a/arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi +++ b/arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi @@ -2,7 +2,20 @@ /* * Copyright (c) 2023 Radxa Limited */ -#include "rk3399-rock-pi-4-u-boot.dtsi" +#include "rk3399-u-boot.dtsi" +#include "rk3399-sdram-lpddr4-100.dtsi" + +/ { + leds { + led-0 { + default-state = "on"; + }; + + led-1 { + default-state = "on"; + }; + }; +};
&pcfg_pull_none_18ma { bootph-pre-ram; @@ -14,6 +27,12 @@ bootph-some-ram; };
+&sdhci { + cap-mmc-highspeed; + mmc-ddr-1_8v; + mmc-hs200-1_8v; +}; + &spi1 { status = "okay";
@@ -25,3 +44,7 @@ spi-max-frequency = <10000000>; }; }; + +&vdd_log { + regulator-init-microvolt = <950000>; +}; diff --git a/arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi b/arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi index b3bfc77f756..4861574636e 100644 --- a/arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi +++ b/arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi @@ -6,6 +6,14 @@ #include "rk3399-u-boot.dtsi" #include "rk3399-sdram-lpddr4-100.dtsi"
+/ { + leds { + led-0 { + default-state = "on"; + }; + }; +}; + &sdhci { cap-mmc-highspeed; mmc-ddr-1_8v; diff --git a/arch/arm/dts/rk3566-radxa-cm3-io-u-boot.dtsi b/arch/arm/dts/rk3566-radxa-cm3-io-u-boot.dtsi index e0e501deccf..412f9e06aff 100644 --- a/arch/arm/dts/rk3566-radxa-cm3-io-u-boot.dtsi +++ b/arch/arm/dts/rk3566-radxa-cm3-io-u-boot.dtsi @@ -5,6 +5,14 @@
#include "rk356x-u-boot.dtsi"
+/ { + leds { + led-1 { + default-state = "on"; + }; + }; +}; + &sdhci { cap-mmc-highspeed; }; diff --git a/arch/arm/dts/rk3568-radxa-e25-u-boot.dtsi b/arch/arm/dts/rk3568-radxa-e25-u-boot.dtsi index 74755a44eae..efeab626d8a 100644 --- a/arch/arm/dts/rk3568-radxa-e25-u-boot.dtsi +++ b/arch/arm/dts/rk3568-radxa-e25-u-boot.dtsi @@ -2,6 +2,29 @@
#include "rk356x-u-boot.dtsi"
+/ { + gpio-leds { + led-0 { + default-state = "on"; + }; + + led-red { + default-state = "on"; + gpios = <&gpio0 RK_PC0 GPIO_ACTIVE_HIGH>; + }; + + led-green { + default-state = "on"; + gpios = <&gpio0 RK_PC1 GPIO_ACTIVE_HIGH>; + }; + + led-blue { + default-state = "on"; + gpios = <&gpio4 RK_PC5 GPIO_ACTIVE_HIGH>; + }; + }; +}; + &pcie3x1 { pinctrl-0 = <&pcie30x1_reset_h>; }; diff --git a/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi b/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi index 9d18f5d0b36..c493352abc1 100644 --- a/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi +++ b/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi @@ -6,6 +6,14 @@
#include "rk356x-u-boot.dtsi"
+/ { + leds { + led-0 { + default-state = "on"; + }; + }; +}; + &pcie3x2 { pinctrl-0 = <&pcie3x2_reset_h>; }; diff --git a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi index 8e318e624a8..8ebba36f90a 100644 --- a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi +++ b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi @@ -5,6 +5,14 @@
#include "rk3588-u-boot.dtsi"
+/ { + leds { + led_rgb_b { + default-state = "on"; + }; + }; +}; + &fspim2_pins { bootph-pre-ram; bootph-some-ram; diff --git a/arch/arm/dts/rk3588s-rock-5a-u-boot.dtsi b/arch/arm/dts/rk3588s-rock-5a-u-boot.dtsi index efba0c359ba..a75ae296386 100644 --- a/arch/arm/dts/rk3588s-rock-5a-u-boot.dtsi +++ b/arch/arm/dts/rk3588s-rock-5a-u-boot.dtsi @@ -5,6 +5,14 @@
#include "rk3588s-u-boot.dtsi"
+/ { + leds { + io-led { + default-state = "on"; + }; + }; +}; + &sdhci { cap-mmc-highspeed; mmc-hs200-1_8v;
Hello Fukaumi,
Please see a comment below.
On 2024-08-08 11:27, FUKAUMI Naoki wrote:
Basically, Radxa's boards are intended to turn LEDs on at U-Boot. add `default-state = "on"` to u-boot.dtsi.
Signed-off-by: FUKAUMI Naoki naoki@radxa.com
.../arm/dts/rk3328-rock-pi-e-base-u-boot.dtsi | 6 +++++ arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi | 25 ++++++++++++++++++- arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi | 8 ++++++ arch/arm/dts/rk3566-radxa-cm3-io-u-boot.dtsi | 8 ++++++ arch/arm/dts/rk3568-radxa-e25-u-boot.dtsi | 23 +++++++++++++++++ arch/arm/dts/rk3568-rock-3a-u-boot.dtsi | 8 ++++++ arch/arm/dts/rk3588-rock-5b-u-boot.dtsi | 8 ++++++ arch/arm/dts/rk3588s-rock-5a-u-boot.dtsi | 8 ++++++ 8 files changed, 93 insertions(+), 1 deletion(-)
diff --git a/arch/arm/dts/rk3328-rock-pi-e-base-u-boot.dtsi b/arch/arm/dts/rk3328-rock-pi-e-base-u-boot.dtsi index 39bb66c4fcb..a30adb0be98 100644 --- a/arch/arm/dts/rk3328-rock-pi-e-base-u-boot.dtsi +++ b/arch/arm/dts/rk3328-rock-pi-e-base-u-boot.dtsi @@ -6,6 +6,12 @@ #include "rk3328-u-boot.dtsi"
/ {
- leds {
led-0 {default-state = "on";};- };
- smbios { compatible = "u-boot,sysinfo-smbios";
diff --git a/arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi b/arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi index 5ec15a845c1..614e4ce0fa8 100644 --- a/arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi +++ b/arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi @@ -2,7 +2,20 @@ /*
- Copyright (c) 2023 Radxa Limited
*/ -#include "rk3399-rock-pi-4-u-boot.dtsi" +#include "rk3399-u-boot.dtsi" +#include "rk3399-sdram-lpddr4-100.dtsi"
+/ {
- leds {
led-0 {default-state = "on";};led-1 {default-state = "on";};- };
+};
&pcfg_pull_none_18ma { bootph-pre-ram; @@ -14,6 +27,12 @@ bootph-some-ram; };
+&sdhci {
- cap-mmc-highspeed;
- mmc-ddr-1_8v;
- mmc-hs200-1_8v;
+};
This change should be taken out of the patch, because it doesn't match the patch description. If the change is still needed, it should be submitted as a separate patch.
&spi1 { status = "okay";
@@ -25,3 +44,7 @@ spi-max-frequency = <10000000>; }; };
+&vdd_log {
- regulator-init-microvolt = <950000>;
+}; diff --git a/arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi b/arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi index b3bfc77f756..4861574636e 100644 --- a/arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi +++ b/arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi @@ -6,6 +6,14 @@ #include "rk3399-u-boot.dtsi" #include "rk3399-sdram-lpddr4-100.dtsi"
+/ {
- leds {
led-0 {default-state = "on";};- };
+};
&sdhci { cap-mmc-highspeed; mmc-ddr-1_8v; diff --git a/arch/arm/dts/rk3566-radxa-cm3-io-u-boot.dtsi b/arch/arm/dts/rk3566-radxa-cm3-io-u-boot.dtsi index e0e501deccf..412f9e06aff 100644 --- a/arch/arm/dts/rk3566-radxa-cm3-io-u-boot.dtsi +++ b/arch/arm/dts/rk3566-radxa-cm3-io-u-boot.dtsi @@ -5,6 +5,14 @@
#include "rk356x-u-boot.dtsi"
+/ {
- leds {
led-1 {default-state = "on";};- };
+};
&sdhci { cap-mmc-highspeed; }; diff --git a/arch/arm/dts/rk3568-radxa-e25-u-boot.dtsi b/arch/arm/dts/rk3568-radxa-e25-u-boot.dtsi index 74755a44eae..efeab626d8a 100644 --- a/arch/arm/dts/rk3568-radxa-e25-u-boot.dtsi +++ b/arch/arm/dts/rk3568-radxa-e25-u-boot.dtsi @@ -2,6 +2,29 @@
#include "rk356x-u-boot.dtsi"
+/ {
- gpio-leds {
led-0 {default-state = "on";};led-red {default-state = "on";gpios = <&gpio0 RK_PC0 GPIO_ACTIVE_HIGH>;};led-green {default-state = "on";gpios = <&gpio0 RK_PC1 GPIO_ACTIVE_HIGH>;};led-blue {default-state = "on";gpios = <&gpio4 RK_PC5 GPIO_ACTIVE_HIGH>;};- };
+};
&pcie3x1 { pinctrl-0 = <&pcie30x1_reset_h>; }; diff --git a/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi b/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi index 9d18f5d0b36..c493352abc1 100644 --- a/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi +++ b/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi @@ -6,6 +6,14 @@
#include "rk356x-u-boot.dtsi"
+/ {
- leds {
led-0 {default-state = "on";};- };
+};
&pcie3x2 { pinctrl-0 = <&pcie3x2_reset_h>; }; diff --git a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi index 8e318e624a8..8ebba36f90a 100644 --- a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi +++ b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi @@ -5,6 +5,14 @@
#include "rk3588-u-boot.dtsi"
+/ {
- leds {
led_rgb_b {default-state = "on";};- };
+};
&fspim2_pins { bootph-pre-ram; bootph-some-ram; diff --git a/arch/arm/dts/rk3588s-rock-5a-u-boot.dtsi b/arch/arm/dts/rk3588s-rock-5a-u-boot.dtsi index efba0c359ba..a75ae296386 100644 --- a/arch/arm/dts/rk3588s-rock-5a-u-boot.dtsi +++ b/arch/arm/dts/rk3588s-rock-5a-u-boot.dtsi @@ -5,6 +5,14 @@
#include "rk3588s-u-boot.dtsi"
+/ {
- leds {
io-led {default-state = "on";};- };
+};
&sdhci { cap-mmc-highspeed; mmc-hs200-1_8v;
participants (2)
-
Dragan Simic -
FUKAUMI Naoki