- May 07, 2024
-
-
https://source.denx.de/u-boot/custodians/u-boot-rockchipTom Rini authored
CI: https://source.denx.de/u-boot/custodians/u-boot-rockchip/-/pipelines/20628 - migrate to use OF_UPSTREAM for rv1108, rk3308, rk3328, rk356x, rk3588;
-
While the Turing RK1 board has a pad on the PCB for SPI flash, it is not populated at the factory: supporting SPI flash boot is a user modification, not an out-of-the-box feature. The defconfig for this board should therefore not be enabling the SPI flash image nor SPI support in the SPL, as it causes confusion among downstream users as to whether the SPI image needs to be distributed. Fixes: 153ac950 ("board: rockchip: Add the Turing RK1 SoM") Suggested-by:
Florian Klink <flokli@flokli.de> Signed-off-by:
Sam Edwards <CFSworks@gmail.com> Acked-by:
Joshua Riek <jjriek@verizon.net> Reviewed-by:
Jonas Karlman <jonas@kwiboo.se> Reviewed-by:
Kever Yang <kever.yang@rock-chips.com>
-
The SCLK_USB3OTG_REF clocks is used as reference clock for USB3 block. Add simple support to get rate of SCLK_USB3OTG_REF clocks to fix reference clock period configuration. Signed-off-by:
-
Add bootph-some-ram props to pinctrl nodes related to eMMC, SD-card and SPI flash to match e.g. RK3308 and RK3399. Also adjust bootph props for sdio_vcc_pin, pinctrl and uart2m1_xfer. Fixes: 1e21f569 ("rockchip: rk3328: Fix loading FIT from SD-card when booting from eMMC") Signed-off-by:
-
Instead of using the local rv1108 devicetree copies from U-Boot, let's convert the rv1108 boards to OF_UPSTREAM so that the upstream kernel devicetrees can be used instead. Tested on a rv1108-elgin-r1 board. Signed-off-by:
Fabio Estevam <festevam@gmail.com> Reviewed-by:
Otavio Salvador <otavio@ossystems.com.br> Tested-by:
-
Remove redundant device tree files now that RK3588 boards have been migrated to use OF_UPSTREAM. Signed-off-by:
-
Migrate RK3588 boards that exists in Linux v6.8 to use OF_UPSTREAM. Following targets is not migrated to use OF_UPSTREAM: - generic-rk3588: Generic target only meant for U-Boot use - toybrick-rk3588: Merged in v6.9-rc1 Signed-off-by:
-
The USB3 related DT nodes in SoC u-boot.dtsi is slightly different from the final nodes being targeted for Linux kernel v6.10. Sync USB3 related nodes from Linux maintainer v6.10-rockchip-dts64-1 tag to prepare for migration of RK3588 to use OF_UPSTREAM. Signed-off-by:
-
The usb-typec related nodes and props added in the board u-boot.dtsi file has not yet landed in upstream Linux kernel DT, and they are not needed for U-Boot to use the USB Type-C port in peripheral mode. Remove superfluous usb-typec related nodes and props and replace them with a simple dr_mode and maximum-speed prop to cleanup the board u-boot.dtsi file. Signed-off-by:
-
The upstream DT binding added in linux-phy next commit a75d8056e9fe ("dt-bindings: phy: add rockchip usbdp combo phy document") does not define subnodes for the type of PHY, instead it is expected that phandle args are used for setting the type of the PHY. phys = <&usbdp_phy0 PHY_TYPE_USB3> Adopt the usbdp phy driver to work with upstream DT binding targeted for Linux kernel v6.10. Signed-off-by: -
Remove the rockchip_u3phy_uboot_init() function, it has no caller and is not needed with proper driver model use. Signed-off-by:
-
The upstream Linux kernel driver find the phy-id from the io address. Change to use a similar method as the U-Boot inno-usb2 phy driver and the Linux kernel driver to set correct phy-id. This is based on the linux-phy next commit 2f70bbddeb45 ("phy: rockchip: add usbdp combo phy driver"). Signed-off-by: -
Remove redundant device tree files now that RK356x boards have been migrated to use OF_UPSTREAM. Signed-off-by:
-
Migrate RK356x boards that exists in Linux v6.8 to use OF_UPSTREAM. Following targets is not migrated to use OF_UPSTREAM: - anbernic-rgxx3-rk3566: Multi device target - generic-rk3568: Generic target only meant for U-Boot use - pinetab2-rk3566: Merged in v6.9-rc1 Signed-off-by:
-
Add a <CONFIG_SYS_SOC>-u-boot.dtsi file that gets included by default for RK356x boards when a board specific u-boot.dtsi file dont exists. Signed-off-by:
-
Remove redundant device tree files now that RK3399 boards have been migrated to use OF_UPSTREAM. Signed-off-by:
-
All RK3399 boards has now been synced to Linux kernel v6.8 DTs and can migrate to use OF_UPSTREAM. Migrate RK3399 boards that exists in Linux v6.8 to use OF_UPSTREAM. Following target is not migrated to use OF_UPSTREAM: - nanopi-m4-2gb-rk3399: DDR3 variant of nanopi-m4-rk3399 (LPDDR3) Signed-off-by:
-
Remove redundant device tree files now that RK3328 boards have been migrated to use OF_UPSTREAM. Signed-off-by:
-
All RK3328 boards has now been synced to Linux kernel v6.8 DTs and can migrate to use OF_UPSTREAM. Migrate all RK3328 boards to use OF_UPSTREAM. Signed-off-by:
-
Remove redundant device tree files now that RK3308 boards have been migrated to use OF_UPSTREAM. Signed-off-by:
-
All RK3308 boards has now been synced to Linux kernel v6.8 DTs and can migrate to use OF_UPSTREAM. Migrate all RK3308 boards to use OF_UPSTREAM. Signed-off-by:
-
Remove the obsolete ethernet0 alias now that all board device tree files have been fully synced with Linux kernel v6.8. Signed-off-by:
Dragan Simic <dsimic@manjaro.org> Reviewed-by:
Christopher Obbard <chris.obbard@collabora.com> Reviewed-by:
Peter Robinson <pbrobinson@gmail.com>
-
Sync rk3399-pinephone-pro device tree from Linux kernel v6.8. Add SPI flash related node and options to support boot from SPI flash. Remove REGULATOR_PWM=y, board does not use pwm-regulator compatible. Add SYS_NS16550_MEM32=y to use readl/writel for serial console. Remove SPL_TINY_MEMSET=y to use full memset in SPL. Signed-off-by:
-
Sync rk3399-pinebook-pro device tree from Linux kernel v6.8. Add SF_DEFAULT_SPEED=10000000 and SPI_FLASH_SFDP_SUPPORT=y to improve support for booting from SPI flash. Add CMD_POWEROFF=y to support poweroff using cmdline and power on using the pwr button on the board. Remove SPL_TINY_MEMSET=y to use full memset in SPL. Signed-off-by:
-
Sync rk3399-rockpro64 device tree from Linux kernel v6.8. Add SF_DEFAULT_SPEED=10000000 and SPI_FLASH_SFDP_SUPPORT=y to improve support for booting from SPI flash. Remove USE_PREBOOT=y to speed up booting, standard boot will init USB after faster boot media has been evaluated. Add CMD_POWEROFF=y to support poweroff using cmdline and power on using the pwr button on the board. Add PHY_REALTEK=y and DM_ETH_PHY=y to support ethernet PHY. Remove SPL_TINY_MEMSET=y to use full memset in SPL. Signed-off-by:
-
Sync rk3399-rock-pi-4 related device tree from Linux kernel v6.8. Add SPI flash related nodes and options to support boot from SPI flash. Add AHCI=y, SCSI_AHCI=y, AHCI_PCI=y and SCSI=y to support SATA HAT. Change to SPL_MAX_SIZE=0x40000, SPL can be up to 256 KiB. Add ROCKCHIP_IODOMAIN=y to configure io-domain voltage. Add PHY_REALTEK=y and DM_ETH_PHY=y to support ethernet PHY. Remove SPL_TINY_MEMSET=y to use full memset in SPL. Signed-off-by:
-
Sync rk3399-khadas related device tree from Linux kernel v6.8. Add SPI flash related options to support booting from SPI flash. Add DM_RESET=y to support reset signals. Add PCI=y, CMD_PCI=y and NVME_PCI=y to support PCIe and NVMe boot. Change to SPL_MAX_SIZE=0x40000, SPL can be up to 256 KiB. Add CMD_ROCKUSB=y, CMD_USB_MASS_STORAGE=y and USB_GADGET=y to support RockUSB and UMS gadget. Remove CONFIG_NET_RANDOM_ETHADDR=y, ethaddr and eth1addr is set based on cpuid read from eFUSE. Add ROCKCHIP_IODOMAIN=y to configure io-domain voltage. Add MMC_SDHCI_SDMA=y to use DMA transfer for eMMC. Add DM_ETH_PHY=y to support ethernet PHY. Add PHY_ROCKCHIP_INNO_USB2=y and PHY_ROCKCHIP_TYPEC=y to support USB PHY. Remove SPL_TINY_MEMSET=y to use full memset in SPL. Signed-off-by:
-
Sync rk3399-rock960 related device tree from Linux kernel v6.8. 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. Add CMD_ROCKUSB=y, CMD_USB_MASS_STORAGE=y and USB_GADGET=y to support RockUSB and UMS gadget. Remove SPL_TINY_MEMSET=y to use full memset in SPL. Signed-off-by:
-
Sync rk3399-nanopi-4 related device tree from Linux kernel v6.8. 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 M4 SATA HAT. Add ROCKCHIP_IODOMAIN=y to configure io-domain voltage. 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, boards does not use pwm-regulator compatible. Remove SPL_TINY_MEMSET=y to use full memset in SPL. Signed-off-by:
-
Sync rk3399-roc-pc related device tree from Linux kernel v6.8. Add SF_DEFAULT_SPEED=30000000 and SPI_FLASH_SFDP_SUPPORT=y to improve support for booting from SPI flash. Add ROCKCHIP_IODOMAIN=y to configure io-domain voltage. Add MMC_SDHCI_SDMA=y to use DMA transfer for eMMC. Add PHY_REALTEK=y and DM_ETH_PHY=y to support ethernet PHY. Remove SPL_TINY_MEMSET=y to use full memset in SPL. Remove USE_PREBOOT=y to speed up booting, standard boot will init USB after faster boot media has been evaluated. Signed-off-by:
-
Sync rk3399-orangepi device tree from Linux kernel v6.8. Add DM_RESET=y to support reset signals. Change to SPL_MAX_SIZE=0x40000, SPL can be up to 256 KiB. Add ROCKCHIP_IODOMAIN=y to configure io-domain voltage. 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 SPL_TINY_MEMSET=y to use full memset in SPL. Signed-off-by:
-
Sync rk3399-firefly device tree from Linux kernel v6.8. Change to SPL_MAX_SIZE=0x40000, SPL can be up to 256 KiB. Add ROCKCHIP_IODOMAIN=y to configure io-domain voltage. 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 SPL_TINY_MEMSET=y to use full memset in SPL. Signed-off-by:
-
Sync rk3399-evb device tree from Linux kernel v6.8. Drop bootph prop for i2c0 and rk808 node, PMIC support is not included in TPL/SPL and PMIC regulators are working fine in U-Boot proper. Change to use sdmmc_cd pinconf and drop cd-gpios for card detect pin. 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 PHY_REALTEK=y and DM_ETH_PHY=y to support ethernet PHY. Remove SPL_TINY_MEMSET=y to use full memset in SPL. Signed-off-by:
-
Sync rk3399-leez-p710 device tree from Linux kernel v6.8. Add DM_RESET=y to support reset signals. Change to SPL_MAX_SIZE=0x40000, SPL can be up to 256 KiB. Add ROCKCHIP_IODOMAIN=y to configure io-domain voltage. 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 SPL_TINY_MEMSET=y to use full memset in SPL. Signed-off-by:
-
Sync rk3399-eaidk-610 device tree from Linux kernel v6.8. Add DM_RESET=y to support reset signals. Change to SPL_MAX_SIZE=0x40000, SPL can be up to 256 KiB. Add ROCKCHIP_IODOMAIN=y to configure io-domain voltage. 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, board does not use pwm-regulator compatible. Remove SPL_TINY_MEMSET=y to use full memset in SPL. Signed-off-by:
-
Sync rk3399-rock-pi-n10 related device tree from Linux kernel v6.8. Remove SPL_GPIO=y, board does not use gpio in SPL. Change to SPL_MAX_SIZE=0x40000, SPL can be up to 256 KiB. Add ROCKCHIP_IODOMAIN=y to configure io-domain voltage. Add MMC_SDHCI_SDMA=y to use DMA transfer for eMMC. Add PHY_REALTEK=y and DM_ETH_PHY=y to support ethernet PHY. Remove REGULATOR_PWM=y, board does not use pwm-regulator compatible. Signed-off-by:
-
Sync rk3399-puma related device tree from Linux kernel v6.8. The vdd_log node is already part of rk3399-puma.dtsi, only keep the regulator-init-microvolt prop in u-boot.dtsi. Signed-off-by:
Quentin Schulz <quentin.schulz@theobroma-systems.com> Reviewed-by:
-
Sync rk3399-gru related device tree from Linux kernel v6.8. The spi_flash symbol is no longer part of upstream DT, it is re-defined to allow existing reference use in related u-boot.dtsi-files. Signed-off-by:
-
Sync RK3399 SoC common .dtsi-files from Linux kernel v6.8. The ethernet0 alias is moved to rk3399-u-boot.dtsi in this patch, the alias will be added in board specific .dts-files and finally removed from rk3399-u-boot.dtsi in following patches. The rng node is replaced with crypto0 and crypto1, both can supply random numbers. There is no other intended change with this patch. Signed-off-by:
-
The SCLK_USB3OTGx_REF clocks is used as reference clock for USB3 block. Add simple support to get rate of SCLK_USB3OTGx_REF clocks to fix reference clock period configuration. Also replace use of 24000000 with the OSC_HZ constant. Signed-off-by:
-
