[PATCH 26/31] rockchip: rk3399-rock960: Sync device tree from linux v6.8
Jonas Karlman
jonas at kwiboo.se
Wed May 1 14:28:19 CEST 2024
Hi Peter,
On 2024-04-03 06:53, Peter Robinson wrote:
> On Sun, 31 Mar 2024 at 21:34, Jonas Karlman <jonas at kwiboo.se> wrote:
>>
>> Sync rk3399-rock960 related device tree from linux v6.8.
>
> TBH I wouldn't class this as "Sync device tree from linux v6.8", it
> does a dozen other things as well!
Agree, I have updated the commit subject to "Sync DT from v6.8 and
update defconfig" in v2, not sure that will fully address your concern.
This series tries to update all rk3399 boards to v6.8 DT and enable a
few similar options (when DT node exists) across all RK3399 boards.
Some boards was missing a lot of features/options that already is
supported on other RK3399 boards and having a bigger "get up to date"
commit makes sense to me :-)
>
>> Add DM_RESET=y to support reset signals.
>>
>> Add PCI=y, CMD_PCI=y and NVME_PCI=y to support PCIe and NVMe boot.
>>
>> Add AHCI=y, SCSI_AHCI=y, AHCI_PCI=y and SCSI=y to support PCIe SATA boot.
>>
>> Change to SPL_MAX_SIZE=0x40000, SPL can be up to 256 KiB.
>>
>> Remove CONFIG_NET_RANDOM_ETHADDR=y, ethaddr and eth1addr is set based on
>> cpuid read from eFUSE.
>>
>> Add MMC_SDHCI_SDMA=y to use DMA transfer for eMMC.
>>
>> Add PHY_REALTEK=y and DM_ETH_PHY=y to support ethernet PHY.
>>
>> Add PHY_ROCKCHIP_INNO_USB2=y and PHY_ROCKCHIP_TYPEC=y to support USB PHY.
>>
>> Remove REGULATOR_PWM=y and DM_REGULATOR_GPIO=y, boards does not use
>> pwm-regulator or regulator-gpio compatible.
>>
>> Add USB_XHCI_HCD=y, USB_DWC3=y and USB_DWC3_GENERIC=y to support USB3.
>>
>> Remove USE_PREBOOT=y to speed up booting, standard boot will init USB
>> after faster boot media has been evaluated.
>
> Does it init nvme and friends?
Yes, it should init nvme and friends after it has tried to find
extlinux/script/efi on faster boot media (sdhci/sdmmc).
>
>> Add CMD_ROCKUSB=y, CMD_USB_MASS_STORAGE=y and USB_GADGET=y to support
>> RockUSB and UMS gadget.
>
> Does this have effect on boot speed?
It should not affect boot speed, end-user will have to run a rockusb/ums
cmd on cli to use this feature.
Regards,
Jonas
>
>> Remove SPL_TINY_MEMSET=y to use full memset in SPL.
>>
>> Signed-off-by: Jonas Karlman <jonas at kwiboo.se>
>> ---
>> arch/arm/dts/rk3399-ficus.dts | 4 ++++
>> arch/arm/dts/rk3399-rock960.dtsi | 5 ++++-
>> configs/ficus-rk3399_defconfig | 22 +++++++++++++++++-----
>> configs/rock960-rk3399_defconfig | 14 +++++++++++---
>> 4 files changed, 36 insertions(+), 9 deletions(-)
>>
>> diff --git a/arch/arm/dts/rk3399-ficus.dts b/arch/arm/dts/rk3399-ficus.dts
>> index 1ce85a5816e4..30e4879f322c 100644
>> --- a/arch/arm/dts/rk3399-ficus.dts
>> +++ b/arch/arm/dts/rk3399-ficus.dts
>> @@ -13,6 +13,10 @@
>> model = "96boards RK3399 Ficus";
>> compatible = "vamrs,ficus", "rockchip,rk3399";
>>
>> + aliases {
>> + ethernet0 = &gmac;
>> + };
>> +
>> chosen {
>> stdout-path = "serial2:1500000n8";
>> };
>> diff --git a/arch/arm/dts/rk3399-rock960.dtsi b/arch/arm/dts/rk3399-rock960.dtsi
>> index 25dc61c26a94..c920ddf44baf 100644
>> --- a/arch/arm/dts/rk3399-rock960.dtsi
>> +++ b/arch/arm/dts/rk3399-rock960.dtsi
>> @@ -7,6 +7,7 @@
>>
>> #include "rk3399.dtsi"
>> #include "rk3399-opp.dtsi"
>> +#include <dt-bindings/interrupt-controller/irq.h>
>>
>> / {
>> aliases {
>> @@ -127,6 +128,8 @@
>> };
>>
>> &hdmi {
>> + avdd-0v9-supply = <&vcca0v9_hdmi>;
>> + avdd-1v8-supply = <&vcca1v8_hdmi>;
>> ddc-i2c-bus = <&i2c3>;
>> pinctrl-names = "default";
>> pinctrl-0 = <&hdmi_cec>;
>> @@ -528,7 +531,7 @@
>> compatible = "brcm,bcm4329-fmac";
>> reg = <1>;
>> interrupt-parent = <&gpio0>;
>> - interrupts = <RK_PA3 GPIO_ACTIVE_HIGH>;
>> + interrupts = <RK_PA3 IRQ_TYPE_LEVEL_HIGH>;
>> interrupt-names = "host-wake";
>> pinctrl-names = "default";
>> pinctrl-0 = <&wifi_host_wake_l>;
>> diff --git a/configs/ficus-rk3399_defconfig b/configs/ficus-rk3399_defconfig
>> index f4e3ebba8f46..0d97b7ecb3c7 100644
>> --- a/configs/ficus-rk3399_defconfig
>> +++ b/configs/ficus-rk3399_defconfig
>> @@ -5,15 +5,18 @@ CONFIG_ARCH_ROCKCHIP=y
>> CONFIG_SF_DEFAULT_SPEED=20000000
>> CONFIG_ENV_OFFSET=0x3F8000
>> CONFIG_DEFAULT_DEVICE_TREE="rk3399-ficus"
>> +CONFIG_DM_RESET=y
>> CONFIG_ROCKCHIP_RK3399=y
>> CONFIG_TARGET_ROCK960_RK3399=y
>> CONFIG_DEBUG_UART_BASE=0xFF1A0000
>> CONFIG_DEBUG_UART_CLOCK=24000000
>> CONFIG_SYS_LOAD_ADDR=0x800800
>> +CONFIG_PCI=y
>> CONFIG_DEBUG_UART=y
>> +CONFIG_AHCI=y
>> CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-ficus.dtb"
>> CONFIG_DISPLAY_BOARDINFO_LATE=y
>> -CONFIG_SPL_MAX_SIZE=0x2e000
>> +CONFIG_SPL_MAX_SIZE=0x40000
>> CONFIG_SPL_PAD_TO=0x7f8000
>> # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
>> CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y
>> @@ -21,6 +24,7 @@ CONFIG_TPL=y
>> CONFIG_CMD_BOOTZ=y
>> CONFIG_CMD_GPT=y
>> CONFIG_CMD_MMC=y
>> +CONFIG_CMD_PCI=y
>> CONFIG_CMD_USB=y
>> # CONFIG_CMD_SETEXPR is not set
>> CONFIG_CMD_TIME=y
>> @@ -29,27 +33,35 @@ CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigne
>> CONFIG_ENV_IS_IN_MMC=y
>> CONFIG_SYS_RELOC_GD_ENV_ADDR=y
>> CONFIG_SYS_MMC_ENV_DEV=1
>> -CONFIG_NET_RANDOM_ETHADDR=y
>> +CONFIG_SCSI_AHCI=y
>> +CONFIG_AHCI_PCI=y
>> CONFIG_ROCKCHIP_GPIO=y
>> CONFIG_SYS_I2C_ROCKCHIP=y
>> CONFIG_ROCKCHIP_IODOMAIN=y
>> CONFIG_MMC_DW=y
>> CONFIG_MMC_DW_ROCKCHIP=y
>> CONFIG_MMC_SDHCI=y
>> +CONFIG_MMC_SDHCI_SDMA=y
>> CONFIG_MMC_SDHCI_ROCKCHIP=y
>> +CONFIG_PHY_REALTEK=y
>> +CONFIG_DM_ETH_PHY=y
>> CONFIG_ETH_DESIGNWARE=y
>> -CONFIG_RGMII=y
>> CONFIG_GMAC_ROCKCHIP=y
>> +CONFIG_NVME_PCI=y
>> +CONFIG_PHY_ROCKCHIP_INNO_USB2=y
>> +CONFIG_PHY_ROCKCHIP_TYPEC=y
>> CONFIG_PMIC_RK8XX=y
>> -CONFIG_REGULATOR_PWM=y
>> -CONFIG_DM_REGULATOR_GPIO=y
>> CONFIG_REGULATOR_RK8XX=y
>> CONFIG_PWM_ROCKCHIP=y
>> +CONFIG_SCSI=y
>> CONFIG_BAUDRATE=1500000
>> CONFIG_DEBUG_UART_SHIFT=2
>> CONFIG_SYS_NS16550_MEM32=y
>> CONFIG_SYSRESET=y
>> CONFIG_USB=y
>> +CONFIG_USB_XHCI_HCD=y
>> CONFIG_USB_EHCI_HCD=y
>> CONFIG_USB_EHCI_GENERIC=y
>> +CONFIG_USB_DWC3=y
>> +CONFIG_USB_DWC3_GENERIC=y
>> CONFIG_ERRNO_STR=y
>> diff --git a/configs/rock960-rk3399_defconfig b/configs/rock960-rk3399_defconfig
>> index 3b5ab7dc5781..e19b28753156 100644
>> --- a/configs/rock960-rk3399_defconfig
>> +++ b/configs/rock960-rk3399_defconfig
>> @@ -12,11 +12,11 @@ CONFIG_DEBUG_UART_CLOCK=24000000
>> CONFIG_SYS_LOAD_ADDR=0x800800
>> CONFIG_PCI=y
>> CONFIG_DEBUG_UART=y
>> -CONFIG_USE_PREBOOT=y
>> +CONFIG_AHCI=y
>> CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock960.dtb"
>> CONFIG_SYS_PBSIZE=1052
>> CONFIG_DISPLAY_BOARDINFO_LATE=y
>> -CONFIG_SPL_MAX_SIZE=0x2e000
>> +CONFIG_SPL_MAX_SIZE=0x40000
>> CONFIG_SPL_PAD_TO=0x7f8000
>> # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
>> CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y
>> @@ -28,6 +28,8 @@ CONFIG_CMD_MMC=y
>> CONFIG_CMD_PCI=y
>> # CONFIG_CMD_SF is not set
>> CONFIG_CMD_USB=y
>> +CONFIG_CMD_ROCKUSB=y
>> +CONFIG_CMD_USB_MASS_STORAGE=y
>> # CONFIG_CMD_SETEXPR is not set
>> CONFIG_CMD_TIME=y
>> CONFIG_CMD_PMIC=y
>> @@ -37,6 +39,9 @@ CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigne
>> CONFIG_ENV_IS_IN_MMC=y
>> CONFIG_SYS_RELOC_GD_ENV_ADDR=y
>> CONFIG_SYS_MMC_ENV_DEV=1
>> +CONFIG_SCSI_AHCI=y
>> +CONFIG_AHCI_PCI=y
>> +# CONFIG_USB_FUNCTION_FASTBOOT is not set
>> CONFIG_ROCKCHIP_GPIO=y
>> CONFIG_SYS_I2C_ROCKCHIP=y
>> CONFIG_ROCKCHIP_IODOMAIN=y
>> @@ -52,6 +57,7 @@ CONFIG_PMIC_RK8XX=y
>> CONFIG_REGULATOR_PWM=y
>> CONFIG_REGULATOR_RK8XX=y
>> CONFIG_PWM_ROCKCHIP=y
>> +CONFIG_SCSI=y
>> CONFIG_BAUDRATE=1500000
>> CONFIG_DEBUG_UART_SHIFT=2
>> CONFIG_SYS_NS16550_MEM32=y
>> @@ -71,9 +77,11 @@ CONFIG_USB_ETHER_ASIX88179=y
>> CONFIG_USB_ETHER_MCS7830=y
>> CONFIG_USB_ETHER_RTL8152=y
>> CONFIG_USB_ETHER_SMSC95XX=y
>> +CONFIG_USB_GADGET=y
>> +CONFIG_USB_GADGET_DOWNLOAD=y
>> +CONFIG_USB_FUNCTION_ROCKUSB=y
>> CONFIG_VIDEO=y
>> CONFIG_DISPLAY=y
>> CONFIG_VIDEO_ROCKCHIP=y
>> CONFIG_DISPLAY_ROCKCHIP_HDMI=y
>> -CONFIG_SPL_TINY_MEMSET=y
>> CONFIG_ERRNO_STR=y
>> --
>> 2.43.2
>>
More information about the U-Boot
mailing list