[PATCH 1/2] rockchip: rk3568-rock-3a: Fix SPI Flash alias

[Kever Yang]

On 2023/7/12 20:22, Jonas Karlman wrote:
> The commit 64f79f88a751 ("rockchip: rk3568-rock-3a: Enable boot from SPI
> NOR flash") enabled SPI flash support by overriding the spi0 alias.
>
> Correct this by adding a new spi4 alias in rk356x-u-boot.dtsi and
> SF_DEFAULT_BUS=4 and SPL_DM_SEQ_ALIAS=y in defconfig. Also enabled
> support for parsing and auto discovery of parameters, SFDP.
>
> Fixes: 64f79f88a751 ("rockchip: rk3568-rock-3a: Enable boot from SPI NOR flash")
> Signed-off-by: Jonas Karlman <jonas at kwiboo.se>
Reviewed-by: Kever Yang <kever.yang at rock-chips.com>

Thanks,
- Kever
> ---
>   arch/arm/dts/rk3568-rock-3a-u-boot.dtsi | 4 ----
>   arch/arm/dts/rk356x-u-boot.dtsi         | 1 +
>   configs/rock-3a-rk3568_defconfig        | 3 +++
>   3 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi b/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi
> index 45e9390f202d..6d1d3731d1da 100644
> --- a/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi
> +++ b/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi
> @@ -7,10 +7,6 @@
>   #include "rk356x-u-boot.dtsi"
>   
>   / {
> -	aliases {
> -		spi0 = &sfc;
> -	};
> -
>   	chosen {
>   		stdout-path = &uart2;
>   	};
> diff --git a/arch/arm/dts/rk356x-u-boot.dtsi b/arch/arm/dts/rk356x-u-boot.dtsi
> index 5644f78ec774..d21b18205220 100644
> --- a/arch/arm/dts/rk356x-u-boot.dtsi
> +++ b/arch/arm/dts/rk356x-u-boot.dtsi
> @@ -9,6 +9,7 @@
>   	aliases {
>   		mmc0 = &sdhci;
>   		mmc1 = &sdmmc0;
> +		spi4 = &sfc;
>   	};
>   
>   	chosen {
> diff --git a/configs/rock-3a-rk3568_defconfig b/configs/rock-3a-rk3568_defconfig
> index cc3677e93b7a..c8b3e0430b6d 100644
> --- a/configs/rock-3a-rk3568_defconfig
> +++ b/configs/rock-3a-rk3568_defconfig
> @@ -56,6 +56,7 @@ CONFIG_CMD_REGULATOR=y
>   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"
> +CONFIG_SPL_DM_SEQ_ALIAS=y
>   CONFIG_SPL_REGMAP=y
>   CONFIG_SPL_SYSCON=y
>   CONFIG_SPL_CLK=y
> @@ -68,6 +69,8 @@ CONFIG_MMC_DW_ROCKCHIP=y
>   CONFIG_MMC_SDHCI=y
>   CONFIG_MMC_SDHCI_SDMA=y
>   CONFIG_MMC_SDHCI_ROCKCHIP=y
> +CONFIG_SF_DEFAULT_BUS=4
> +CONFIG_SPI_FLASH_SFDP_SUPPORT=y
>   CONFIG_SPI_FLASH_MACRONIX=y
>   CONFIG_SPI_FLASH_XTX=y
>   CONFIG_ETH_DESIGNWARE=y