diff options
| author | Hugh Cole-Baker <[email protected]> | 2020-11-22 13:03:46 +0000 |
|---|---|---|
| committer | Kever Yang <[email protected]> | 2021-01-21 11:53:36 +0800 |
| commit | a2ca3c6032d5659665e7985e0a3424d99135d3cf (patch) | |
| tree | bea284a9c05786e19e213510fb08928e13f7a0fe | |
| parent | acc57ecf05500d2ed47f0d3898245d0029e1cc0c (diff) | |
rockchip: puma-haikou: default to SPI bus 1 for SPI-flash
SPI flash on this machine is located on bus 1, default to using bus 1
for SPI flash and stop aliasing it to bus 0. Formerly the alias spi1
pointed to &spi5, use an alias spi5 for this instead.
Signed-off-by: Hugh Cole-Baker <[email protected]>
Suggested-by: Kever Yang <[email protected]>
Reviewed-by: Kever Yang<[email protected]>
| -rw-r--r-- | arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi | 3 | ||||
| -rw-r--r-- | configs/puma-rk3399_defconfig | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi b/arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi index 29846c4b001..e7a1aea3a56 100644 --- a/arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi +++ b/arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi @@ -28,8 +28,7 @@ }; aliases { - spi0 = &spi1; - spi1 = &spi5; + spi5 = &spi5; }; /* diff --git a/configs/puma-rk3399_defconfig b/configs/puma-rk3399_defconfig index 60178e3754c..0f15936c2d6 100644 --- a/configs/puma-rk3399_defconfig +++ b/configs/puma-rk3399_defconfig @@ -44,6 +44,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_SYS_MMC_ENV_DEV=1 +CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y CONFIG_MISC=y @@ -53,6 +54,7 @@ CONFIG_MMC_DW_ROCKCHIP=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y CONFIG_MMC_SDHCI_ROCKCHIP=y +CONFIG_SF_DEFAULT_BUS=1 CONFIG_SF_DEFAULT_SPEED=20000000 CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_WINBOND=y |