rockchip: Fix SPI boot on Pinebook Pro, Puma and RK3399-ROC-PC
v2 cover rockchip: Fix SPI boot on Pinebook Pro, Puma and RK3399-ROC-PC
Commit c4cea2bbf995 ("rockchip: Enable building a SPI ROM image on bob") added an alias spi1 referring to spi at ff1d0000, however in several boards there was already an alias spi0 referring to the same node, and having both aliases present broke booting U-Boot from SPI flash.
This series removes the spi0 alias from the Pinebook Pro, RK3399-ROC-PC and Puma dts and sets the default bus for SPI flash to 1, so that the correct device is used. The Rockpro64 board, which was also affected, has already had the same type of fix applied.
This has only been compile-tested - testing by folks who have the affected boards would be welcome.
Changes in v2:
Also make this change to the Puma-Haikou board as suggested by Kever.
Hugh Cole-Baker (3):
rockchip: pinebook-pro: default to SPI bus 1 for SPI-flash
rockchip: rk3399-roc-pc: default to SPI bus 1 for SPI-flash
rockchip: puma-haikou: default to SPI bus 1 for SPI-flash
arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi | 4 ---- arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi | 3 +-- arch/arm/dts/rk3399-roc-pc-u-boot.dtsi | 4 ---- configs/pinebook-pro-rk3399_defconfig | 2 ++ configs/puma-rk3399_defconfig | 2 ++ configs/roc-pc-mezzanine-rk3399_defconfig | 1 + configs/roc-pc-rk3399_defconfig | 1 + 7 files changed, 7 insertions(+), 10 deletions(-)
Signature · 1 line
2.24.3 (Apple Git-128)
PATCH v2 1/3 rockchip: pinebook-pro: 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.
---
(no changes since v1)
arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi | 4 ---- configs/pinebook-pro-rk3399_defconfig | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-)
arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi +0 -4
@@ -7,10 +7,6 @@ #include "rk3399-sdram-lpddr4-100.dtsi" / { - aliases { - spi0 = &spi1; - }; - chosen { u-boot,spl-boot-order = "same-as-spl", &sdhci, &spiflash, &sdmmc; };
configs/pinebook-pro-rk3399_defconfig +2 -0
@@ -37,6 +37,7 @@ CONFIG_SPL_OF_CONTROL=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y CONFIG_DM_KEYBOARD=y
@@ -49,6 +50,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
Signature · 1 line
2.24.3 (Apple Git-128)
PATCH v2 1/3 rockchip: pinebook-pro: default to SPI bus 1 for SPI-flash
Quoted 6 lines · Hugh Cole-Baker
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.
Signed-off-by Hugh Cole-Baker <[email protected]>Suggested-by Simon Glass <[email protected]>Fixes c4cea2bb ("rockchip: Enable building a SPI ROM image on bob")
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210108/1a314926/attachment.sig>
PATCH v2 2/3 rockchip: rk3399-roc-pc: default to SPI bus 1 for SPI-flash
In reply to Hugh Cole-BakerSPI flash on this board is located on bus 1, default to using bus 1 for SPI flash on both rk3399-roc-pc and -mezzanine, and stop aliasing it to bus 0.
---
(no changes since v1)
arch/arm/dts/rk3399-roc-pc-u-boot.dtsi | 4 ---- configs/roc-pc-mezzanine-rk3399_defconfig | 1 + configs/roc-pc-rk3399_defconfig | 1 + 3 files changed, 2 insertions(+), 4 deletions(-)
arch/arm/dts/rk3399-roc-pc-u-boot.dtsi +0 -4
@@ -7,10 +7,6 @@ #include "rk3399-sdram-lpddr4-100.dtsi" / { - aliases { - spi0 = &spi1; - }; - chosen { u-boot,spl-boot-order = "same-as-spl", &spi_flash, &sdhci, &sdmmc; };
configs/roc-pc-mezzanine-rk3399_defconfig +1 -0
@@ -42,6 +42,7 @@ CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ROCKCHIP=y +CONFIG_SF_DEFAULT_BUS=1 CONFIG_SPI_FLASH_WINBOND=y CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y
configs/roc-pc-rk3399_defconfig +1 -0
@@ -41,6 +41,7 @@ CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ROCKCHIP=y +CONFIG_SF_DEFAULT_BUS=1 CONFIG_SPI_FLASH_WINBOND=y CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y
Signature · 1 line
2.24.3 (Apple Git-128)
PATCH v2 3/3 rockchip: puma-haikou: default to SPI bus 1 for SPI-flash
In reply to Hugh Cole-BakerSPI 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.
---
Changes in v2:
New patch.
arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi | 3 +-- configs/puma-rk3399_defconfig | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-)
arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi +1 -2
@@ -28,8 +28,7 @@ }; aliases { - spi0 = &spi1; - spi1 = &spi5; + spi5 = &spi5; }; /*
configs/puma-rk3399_defconfig +2 -0
@@ -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
Signature · 1 line
2.24.3 (Apple Git-128)