[PATCH v3] rockchip: add support for Radxa ROCK 5A with SPI NOR flash module

Wed Oct 30 15:24:48 CET 2024

On 10/30/24 08:30, Kever Yang wrote:
> Hi Naoki,
> 
> On 2024/10/30 14:07, FUKAUMI Naoki wrote:
>> on Radxa ROCK 5A, sdhci(eMMC) and fspim0(SPI NOR flash) share pins
>> (i.e. eMMC and SPI NOR flash are exclusive), new defconfig and dts
>> specifically for SPI NOR flash is required.
>>
>> Signed-off-by: FUKAUMI Naoki <naoki at radxa.com>
>> ---
>> Changes in v3
>> - drop first patch
>> - fix copyright
>> - run savedefconfig
>> - sync with changes for LED for Radxa boards
>> - add more SPI NOR flash chips
>> Changes in v2
>> - fix subject
>> ---
>>   arch/arm/dts/rk3588s-rock-5a-spi-u-boot.dtsi | 32 +++++++
>>   arch/arm/dts/rk3588s-rock-5a-spi.dts         |  4 +
>>   board/radxa/rock5a-rk3588s/MAINTAINERS       |  5 +-
>>   configs/rock5a-spi-rk3588s_defconfig         | 87 ++++++++++++++++++++
>>   4 files changed, 125 insertions(+), 3 deletions(-)
>>   create mode 100644 arch/arm/dts/rk3588s-rock-5a-spi-u-boot.dtsi
>>   create mode 100644 arch/arm/dts/rk3588s-rock-5a-spi.dts
>>   create mode 100644 configs/rock5a-spi-rk3588s_defconfig
>>
>> diff --git a/arch/arm/dts/rk3588s-rock-5a-spi-u-boot.dtsi b/arch/arm/ 
>> dts/rk3588s-rock-5a-spi-u-boot.dtsi
>> new file mode 100644
>> index 00000000000..7723931d869
>> --- /dev/null
>> +++ b/arch/arm/dts/rk3588s-rock-5a-spi-u-boot.dtsi
>> @@ -0,0 +1,32 @@
>> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
>> +/*
>> + * Copyright (c) 2024 Radxa Computer (Shenzhen) Co., Ltd.
>> + */
>> +
>> +#include "rk3588s-u-boot.dtsi"
>> +
>> +/ {
>> +    leds {
>> +        io-led {
>> +            default-state = "on";
>> +        };
>> +    };
>> +};
>> +
>> +&fspim0_pins {
>> +    bootph-pre-ram;
>> +    bootph-some-ram;
>> +};
>> +
>> +&sdhci {
>> +    status = "disabled";
>> +};
>> +
>> +&sfc {
>> +    status = "okay";
>> +
>> +    flash at 0 {
>> +        bootph-pre-ram;
>> +        bootph-some-ram;
>> +    };
>> +};
>> diff --git a/arch/arm/dts/rk3588s-rock-5a-spi.dts b/arch/arm/dts/ 
>> rk3588s-rock-5a-spi.dts
>> new file mode 100644
>> index 00000000000..780e90d041b
>> --- /dev/null
>> +++ b/arch/arm/dts/rk3588s-rock-5a-spi.dts
>> @@ -0,0 +1,4 @@
>> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
>> +
>> +/dts-v1/;
>> +#include "rk3588s-rock-5a.dts"
>> diff --git a/board/radxa/rock5a-rk3588s/MAINTAINERS b/board/radxa/ 
>> rock5a-rk3588s/MAINTAINERS
>> index a569efa74e3..06ebc9829f4 100644
>> --- a/board/radxa/rock5a-rk3588s/MAINTAINERS
>> +++ b/board/radxa/rock5a-rk3588s/MAINTAINERS
>> @@ -4,6 +4,5 @@ R:    Jonas Karlman <jonas at kwiboo.se>
>>   S:    Maintained
>>   F:    board/radxa/rock5a-rk3588s
>>   F:    include/configs/rock5a-rk3588s.h
>> -F:    configs/rock5a-rk3588s_defconfig
>> -F:    arch/arm/dts/rk3588s-rock-5a.dts
>> -F:    arch/arm/dts/rk3588s-rock-5a-u-boot.dtsi
>> +F:    configs/rock5a*
>> +F:    arch/arm/dts/rk3588s-rock-5a*
>> diff --git a/configs/rock5a-spi-rk3588s_defconfig b/configs/rock5a- 
>> spi-rk3588s_defconfig
>> new file mode 100644
>> index 00000000000..d6409a12a56
>> --- /dev/null
>> +++ b/configs/rock5a-spi-rk3588s_defconfig
>> @@ -0,0 +1,87 @@
>> +CONFIG_ARM=y
>> +CONFIG_SKIP_LOWLEVEL_INIT=y
>> +CONFIG_COUNTER_FREQUENCY=24000000
>> +CONFIG_ARCH_ROCKCHIP=y
>> +CONFIG_SF_DEFAULT_SPEED=24000000
>> +CONFIG_SF_DEFAULT_MODE=0x2000
>> +CONFIG_DEFAULT_DEVICE_TREE="rk3588s-rock-5a-spi"
>> +CONFIG_ROCKCHIP_RK3588=y
>> +CONFIG_ROCKCHIP_SPI_IMAGE=y
>> +CONFIG_SPL_SERIAL=y
>> +CONFIG_TARGET_ROCK5A_RK3588=y
>> +CONFIG_SYS_LOAD_ADDR=0xc00800
>> +CONFIG_SF_DEFAULT_BUS=5
>> +CONFIG_DEBUG_UART_BASE=0xFEB50000
>> +CONFIG_DEBUG_UART_CLOCK=24000000
>> +CONFIG_SPL_SPI_FLASH_SUPPORT=y
>> +CONFIG_SPL_SPI=y
>> +CONFIG_DEBUG_UART=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/rk3588s-rock-5a.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
> MMC should removed

The eMMC is disabled, but this board has an SD-Card right ?

>> +CONFIG_CMD_USB=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_UPSTREAM is not set
>> +CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned- 
>> clocks assigned-clock-rates assigned-clock-parents"
>> +CONFIG_SPL_DM_SEQ_ALIAS=y
>> +CONFIG_SPL_REGMAP=y
>> +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
>> +CONFIG_MMC_DW_ROCKCHIP=y
>> +CONFIG_MMC_SDHCI=y
>> +CONFIG_MMC_SDHCI_SDMA=y
>> +CONFIG_MMC_SDHCI_ROCKCHIP=y
> 
> MMC relate driver should removed
> 
> 
> Thanks,
> - Kever
>> +CONFIG_SPI_FLASH_SFDP_SUPPORT=y
>> +CONFIG_SPI_FLASH_GIGADEVICE=y
>> +CONFIG_SPI_FLASH_MACRONIX=y
>> +CONFIG_SPI_FLASH_WINBOND=y
>> +CONFIG_SPI_FLASH_XTX=y
>> +CONFIG_PHY_REALTEK=y
>> +CONFIG_DWC_ETH_QOS=y
>> +CONFIG_DWC_ETH_QOS_ROCKCHIP=y
>> +CONFIG_PHY_ROCKCHIP_INNO_USB2=y
>> +CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY=y
>> +CONFIG_PHY_ROCKCHIP_USBDP=y
>> +CONFIG_SPL_PINCTRL=y
>> +CONFIG_PWM_ROCKCHIP=y
>> +CONFIG_SPL_RAM=y
>> +CONFIG_BAUDRATE=1500000
>> +CONFIG_DEBUG_UART_SHIFT=2
>> +CONFIG_SYS_NS16550_MEM32=y
>> +CONFIG_ROCKCHIP_SFC=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_ERRNO_STR=y