Re: [PATCH 4/4] board: rockchip: Add Radxa ROCK 5 ITX

["Heiko Stübner" <heiko@sntech.de>]

Hi Kever,

Am Freitag, 2. August 2024, 08:35:00 CEST schrieb Kever Yang:
> On 2024/8/1 03:41, Jonas Karlman wrote:
> > On 2024-07-31 12:26, Heiko Stuebner wrote:
> >> The Rock 5 ITX is board in ITX form factor using the RK358 SoC
> >>
> >> It can be powered either by 12V, ATX power-supply or PoE.
> >>
> >> Notable peripherals are the 4 SATA ports, M.2 M-Key slot, M.2 E-key slot,
> >> 2*2.5Gb PCIe-connected Ethernet NICs.
> >>
> >> Display options are 2*HDMI, DP via USB-c, eDP + 2*DSI via PCB connectors.
> >>
> >> USB ports are 4*USB3 + 2*USB2 on the back panel and 2-port front-panel
> >> connector.
> >>
> >> Schematics for the board can be found on
> >> -https://dl.radxa.com/rock5/5itx/radxa_rock_5_itx_X1100_schematic.pdf
> >> -https://dl.radxa.com/rock5/5itx/v1110/radxa_rock_5itx_v1110_schematic.pdf
> >>
> >> The naming scheme with the dashes follows Dragan's comment on the mainline
> >> devicetree commit:
> >>      "the name of this board deviates from the standard Radxa naming scheme,
> >>       which is something like "ROCK <number><letter>" thus, "rock-5a" is
> >>       fine, but it should be "rock-5-itx", simply because there's a space
> >>       between "5" and "ITX" in "ROCK 5 ITX"
> >>
> >> Signed-off-by: Heiko Stuebner<heiko@sntech.de>
> >> ---
> >>   arch/arm/dts/rk3588-rock-5-itx-u-boot.dtsi |  18 ++++
> >>   arch/arm/mach-rockchip/rk3588/Kconfig      |  29 ++++++
> >>   board/radxa/rock-5-itx-rk3588/Kconfig      |  12 +++
> >>   board/radxa/rock-5-itx-rk3588/MAINTAINERS  |   7 ++
> >>   configs/rock-5-itx-rk3588_defconfig        | 104 +++++++++++++++++++++
> >>   include/configs/rock-5-itx-rk3588.h        |  15 +++
> >>   6 files changed, 185 insertions(+)
> >>   create mode 100644 arch/arm/dts/rk3588-rock-5-itx-u-boot.dtsi
> >>   create mode 100644 board/radxa/rock-5-itx-rk3588/Kconfig
> >>   create mode 100644 board/radxa/rock-5-itx-rk3588/MAINTAINERS
> >>   create mode 100644 configs/rock-5-itx-rk3588_defconfig
> >>   create mode 100644 include/configs/rock-5-itx-rk3588.h
> > Please also add this board to the rk3588 list in rockchip.rst.
> >
> >> diff --git a/arch/arm/dts/rk3588-rock-5-itx-u-boot.dtsi b/arch/arm/dts/rk3588-rock-5-itx-u-boot.dtsi
> >> new file mode 100644
> >> index 00000000000..c94df088af5
> >> --- /dev/null
> >> +++ b/arch/arm/dts/rk3588-rock-5-itx-u-boot.dtsi
> >> @@ -0,0 +1,18 @@
> >> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> >> +/*
> >> + * Copyright (c) 2023 Collabora Ltd.
> >> + */
> >> +
> >> +#include "rk3588-u-boot.dtsi"
> >> +
> >> +&fspim2_pins {
> >> +	bootph-pre-ram;
> >> +	bootph-some-ram;
> >> +};
> >> +
> >> +&sfc {
> >> +	flash@0 {
> >> +		bootph-pre-ram;
> >> +		bootph-some-ram;
> >> +	};
> >> +};
> > Running "pci enum" without anything in the M.2 M-key slot my board
> > freeze at pcie@fe160000, leaving the mkey regulator always-on seem to
> > work around this:
> >
> > &vcc3v3_mkey {
> > 	regulator-always-on;
> > };
> 
> Does the refclock generator need to depends on this power supply?
> 
> Kernel should have the same problem, the fe160000 and fe150000 shares 
> the clock generator,
> 
> so they should both have the ability to enable the clock, or else the 
> power set as always on could be an option.

correct, for the kernel I'm working on this in [0] to give both
PCIe controllers the ability to control that clock generation.

For u-boot I was aiming to follow Jonas' suggestion to keep the
supply simply on for now. 


Heiko


[0] https://lore.kernel.org/linux-rockchip/20240715110251.261844-1-heiko@sntech.de/


> >> diff --git a/arch/arm/mach-rockchip/rk3588/Kconfig b/arch/arm/mach-rockchip/rk3588/Kconfig
> >> index e751d64e1a1..0dcf2249fb4 100644
> >> --- a/arch/arm/mach-rockchip/rk3588/Kconfig
> >> +++ b/arch/arm/mach-rockchip/rk3588/Kconfig
> >> @@ -185,6 +185,34 @@ config TARGET_ROCK5B_RK3588
> >>   	  USB PD over USB Type-C
> >>   	  Size: 100mm x 72mm (Pico-ITX form factor)
> >>   
> >> +config TARGET_ROCK_5_ITX_RK3588
> >> +	bool "Radxa ROCK-5-ITX RK3588 board"
> >> +	select BOARD_LATE_INIT
> >> +	help
> >> +	  Radxa ROCK-5-ITX is a Rockchip RK3588 based SBC (Single Board
> >> +	  Computer) by Radxa in the ITX formfactor.
> >> +
> >> +	  There are variants depending on the DRAM size : from 4G up to 32G.
> >> +
> >> +	  Specification:
> >> +
> >> +	  Rockchip Rk3588 SoC
> >> +	  4x ARM Cortex-A76, 4x ARM Cortex-A55
> >> +	  4/8/16/24/32GB memory LPDDR5
> >> +	  Mali G610MC4 GPU
> >> +	  2x MIPI CSI 2 multiple lanes connector
> >> +	  eMMC
> >> +	  uSD slot (up to 128GB)
> >> +	  M.2 M-key and M.2 E-key connector
> >> +	  4x SATA
> >> +	  2x USB 2.0 + 4x USB 3.0 Type-A, 2x USB 2.0 Panel, 1x USB 3.0 Type-C
> >> +	  2x HDMI 2.1 output, 1x HDMI input
> >> +	  DP via Type-C
> >> +	  2x DSI via PCB connector
> >> +	  2x 2.5 Gbps Ethernet port
> >> +	  Front-panel connectors for audio and case-power, -leds
> >> +	  Powered by either 12V, ATX power-supply or PoE
> >> +
> >>   config TARGET_SIGE7_RK3588
> >>   	bool "ArmSoM Sige7 RK3588 board"
> >>   	select BOARD_LATE_INIT
> >> @@ -319,6 +347,7 @@ source "board/pine64/quartzpro64-rk3588/Kconfig"
> >>   source "board/turing/turing-rk1-rk3588/Kconfig"
> >>   source "board/radxa/rock5a-rk3588s/Kconfig"
> >>   source "board/radxa/rock5b-rk3588/Kconfig"
> >> +source "board/radxa/rock-5-itx-rk3588/Kconfig"
> >>   source "board/rockchip/evb_rk3588/Kconfig"
> >>   source "board/rockchip/toybrick_rk3588/Kconfig"
> >>   source "board/theobroma-systems/jaguar_rk3588/Kconfig"
> >> diff --git a/board/radxa/rock-5-itx-rk3588/Kconfig b/board/radxa/rock-5-itx-rk3588/Kconfig
> >> new file mode 100644
> >> index 00000000000..f7a7666d531
> >> --- /dev/null
> >> +++ b/board/radxa/rock-5-itx-rk3588/Kconfig
> >> @@ -0,0 +1,12 @@
> >> +if TARGET_ROCK_5_ITX_RK3588
> >> +
> >> +config SYS_BOARD
> >> +	default "rock-5-itx-rk3588"
> >> +
> >> +config SYS_VENDOR
> >> +	default "radxa"
> >> +
> >> +config SYS_CONFIG_NAME
> >> +	default "rock-5-itx-rk3588"
> >> +
> >> +endif
> >> diff --git a/board/radxa/rock-5-itx-rk3588/MAINTAINERS b/board/radxa/rock-5-itx-rk3588/MAINTAINERS
> >> new file mode 100644
> >> index 00000000000..297b0676ddf
> >> --- /dev/null
> >> +++ b/board/radxa/rock-5-itx-rk3588/MAINTAINERS
> >> @@ -0,0 +1,7 @@
> >> +ROCK-5-ITX-RK3588
> >> +M:	Heiko Stuebner<heiko@sntech.de>
> > Feel free to add me as a reviewer of this board:
> >
> > R:	Jonas Karlman<jonas@kwiboo.se>
> >
> >> +S:	Maintained
> >> +F:	board/radxa/rock-5-itx-rk3588
> >> +F:	include/configs/rock-5-itx-rk3588.h
> >> +F:	configs/rock-5-itx-rk3588_defconfig
> >> +F:	arch/arm/dts/rk3588-rock-5-itx-u-boot.dtsi
> >> diff --git a/configs/rock-5-itx-rk3588_defconfig b/configs/rock-5-itx-rk3588_defconfig
> >> new file mode 100644
> >> index 00000000000..2a41642245b
> >> --- /dev/null
> >> +++ b/configs/rock-5-itx-rk3588_defconfig
> >> @@ -0,0 +1,104 @@
> >> +CONFIG_ARM=y
> >> +CONFIG_SKIP_LOWLEVEL_INIT=y
> >> +CONFIG_SYS_HAS_NONCACHED_MEMORY=y
> >> +CONFIG_COUNTER_FREQUENCY=24000000
> >> +CONFIG_ARCH_ROCKCHIP=y
> >> +CONFIG_SF_DEFAULT_SPEED=24000000
> >> +CONFIG_SF_DEFAULT_MODE=0x2000
> >> +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3588-rock-5-itx"
> >> +CONFIG_ROCKCHIP_RK3588=y
> >> +CONFIG_ROCKCHIP_SPI_IMAGE=y
> >> +CONFIG_SPL_SERIAL=y
> >> +CONFIG_TARGET_ROCK5B_RK3588=y
> >> +CONFIG_DEBUG_UART_BASE=0xFEB50000
> >> +CONFIG_DEBUG_UART_CLOCK=24000000
> >> +CONFIG_SPL_SPI_FLASH_SUPPORT=y
> >> +CONFIG_SPL_SPI=y
> >> +CONFIG_SYS_LOAD_ADDR=0xc00800
> >> +CONFIG_PCI=y
> >> +CONFIG_DEBUG_UART=y
> >> +CONFIG_AHCI=y
> >> +CONFIG_FIT=y
> >> +CONFIG_FIT_VERBOSE=y
> >> +CONFIG_SPL_FIT_SIGNATURE=y
> >> +CONFIG_SPL_LOAD_FIT=y
> >> +CONFIG_LEGACY_IMAGE_FORMAT=y
> >> +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3588-rock-5-itx.dtb"
> >> +# CONFIG_DISPLAY_CPUINFO is not set
> >> +CONFIG_DISPLAY_BOARDINFO_LATE=y
> >> +CONFIG_SPL_MAX_SIZE=0x40000
> >> +CONFIG_SPL_PAD_TO=0x7f8000
> >> +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
> >> +CONFIG_SPL_SPI_LOAD=y
> >> +CONFIG_SYS_SPI_U_BOOT_OFFS=0x60000
> >> +CONFIG_SPL_ATF=y
> >> +CONFIG_CMD_GPIO=y
> >> +CONFIG_CMD_GPT=y
> >> +CONFIG_CMD_I2C=y
> >> +CONFIG_CMD_MMC=y
> >> +CONFIG_CMD_PCI=y
> >> +CONFIG_CMD_USB=y
> >> +CONFIG_CMD_ROCKUSB=y
> > Suggest you also add support for the UMS cmd:
> >
> > CONFIG_CMD_USB_MASS_STORAGE=y
> >
> >> +# CONFIG_CMD_SETEXPR is not set
> >> +CONFIG_CMD_REGULATOR=y
> >> +# CONFIG_SPL_DOS_PARTITION is not set
> >> +CONFIG_SPL_OF_CONTROL=y
> >> +CONFIG_OF_LIVE=y
> >> +CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> > Suggest you add following:
> >
> > CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> >
> > Still not fully sure what this option really affect but have started
> > adding it to new boards to closer match older rk33xx boards:
> >
> >
> >> +CONFIG_SPL_DM_SEQ_ALIAS=y
> >> +CONFIG_SPL_REGMAP=y
> >> +CONFIG_SPL_SYSCON=y
> >> +CONFIG_AHCI_PCI=y
> >> +CONFIG_DWC_AHCI=y
> >> +CONFIG_SPL_CLK=y
> >> +# CONFIG_USB_FUNCTION_FASTBOOT is not set
> >> +CONFIG_ROCKCHIP_GPIO=y
> >> +CONFIG_SYS_I2C_ROCKCHIP=y
> > If we want to control the leds in U-Boot:
> >
> > CONFIG_LED=y
> > CONFIG_LED_GPIO=y
> >
> >> +CONFIG_MISC=y
> >> +CONFIG_SUPPORT_EMMC_RPMB=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_SF_DEFAULT_BUS=5
> >> +CONFIG_SPI_FLASH_SFDP_SUPPORT=y
> >> +CONFIG_SPI_FLASH_MACRONIX=y
> >> +CONFIG_SPI_FLASH_XTX=y
> >> +CONFIG_PHYLIB=y
> >> +CONFIG_RTL8169=y
> >> +CONFIG_NVME_PCI=y
> >> +CONFIG_PCIE_DW_ROCKCHIP=y
> >> +CONFIG_PHY_ROCKCHIP_INNO_USB2=y
> >> +CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY=y
> >> +CONFIG_PHY_ROCKCHIP_USBDP=y
> >> +CONFIG_SPL_PINCTRL=y
> > The rk8xx driver support the PMIC used on this board,
> > suggest you add following:
> >
> > CONFIG_DM_PMIC=y
> > CONFIG_PMIC_RK8XX=y
> > CONFIG_REGULATOR_RK8XX=y
> >
> >> +CONFIG_PWM_ROCKCHIP=y
> >> +CONFIG_SPL_RAM=y
> >> +CONFIG_SCSI=y
> >> +CONFIG_BAUDRATE=1500000
> >> +CONFIG_DEBUG_UART_SHIFT=2
> >> +CONFIG_SYS_NS16550_MEM32=y
> >> +CONFIG_ROCKCHIP_SFC=y
> > The PMIC use SPI:
> >
> > CONFIG_ROCKCHIP_SPI=y
> >
> >> +CONFIG_SYSRESET=y
> >> +CONFIG_USB=y
> >> +CONFIG_USB_XHCI_HCD=y
> >> +CONFIG_USB_EHCI_HCD=y
> >> +CONFIG_USB_EHCI_GENERIC=y
> >> +CONFIG_USB_OHCI_HCD=y
> >> +CONFIG_USB_OHCI_GENERIC=y
> >> +CONFIG_USB_DWC3=y
> >> +CONFIG_USB_DWC3_GENERIC=y
> >> +CONFIG_SPL_USB_DWC3_GENERIC=y
> > This can probably be dropped, there is no usb node included in SPL FDT
> > when I check with "dtc -I dtb -O dts spl/u-boot-spl.dtb".
> >
> > Tested following feature on my v1.11 board:
> > - SD-card boot
> > - eMMC boot
> > - SPI flash boot
> > - PCIe/NVMe/AHCI
> > - USB gadget
> > - USB host
> >
> > I did notice some issue with usb host trying to start/stop multiple
> > times. First start after a reset seem to work however after a "usb stop"
> > it is not fully possible to re-enable and have working usb.
> >
> > Do not think this is specific to this board so nothing blocking.
> >
> > Regards,
> > Jonas
> >
> >> +CONFIG_USB_HOST_ETHER=y
> >> +CONFIG_USB_ETHER_ASIX=y
> >> +CONFIG_USB_ETHER_ASIX88179=y
> >> +CONFIG_USB_ETHER_LAN75XX=y
> >> +CONFIG_USB_ETHER_LAN78XX=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_ERRNO_STR=y
> >> diff --git a/include/configs/rock-5-itx-rk3588.h b/include/configs/rock-5-itx-rk3588.h
> >> new file mode 100644
> >> index 00000000000..bc0f9e72bc5
> >> --- /dev/null
> >> +++ b/include/configs/rock-5-itx-rk3588.h
> >> @@ -0,0 +1,15 @@
> >> +/* SPDX-License-Identifier: GPL-2.0+ */
> >> +/*
> >> + * Copyright (c) 2024 Heiko Stuebner<heiko@sntech.de>
> >> + */
> >> +
> >> +#ifndef __ROCK_5_ITX_RK3588_H
> >> +#define __ROCK_5_ITX_RK3588_H
> >> +
> >> +#define ROCKCHIP_DEVICE_SETTINGS \
> >> +		"stdout=serial,vidconsole\0" \
> >> +		"stderr=serial,vidconsole\0"
> >> +
> >> +#include <configs/rk3588_common.h>
> >> +
> >> +#endif /* __ROCK_5_ITX_RK3588_H */