[PATCH 0/2] rockchip: Fix SPI boot on Pinebook Pro and RK3399-ROC-PC

[Hugh Cole-Baker]

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 and
RK3399-ROC-PC 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.

The rk3399 Puma board also has an alias spi0 = &spi1 in its dts, but I
haven't touched its configuration as it seems to have a more complex
setup where spi1 is already an alias that points to &spi5. I don't
have one of these boards to test with, but I suspect it wasn't affected
by the addition of the spi1 alias in rk3399-u-boot.dtsi.


Hugh Cole-Baker (2):
  rockchip: pinebook-pro: default to SPI bus 1 for SPI-flash
  rockchip: rk3399-roc-pc: default to SPI bus 1 for SPI-flash

 arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi | 4 ----
 arch/arm/dts/rk3399-roc-pc-u-boot.dtsi       | 4 ----
 configs/pinebook-pro-rk3399_defconfig        | 2 ++
 configs/roc-pc-mezzanine-rk3399_defconfig    | 1 +
 configs/roc-pc-rk3399_defconfig              | 1 +
 5 files changed, 4 insertions(+), 8 deletions(-)

-- 
2.24.3 (Apple Git-128)