mbox series

[v2,0/3] rockchip: Fix SPI boot on Pinebook Pro, Puma and RK3399-ROC-PC

Message ID 20201122130346.11621-1-sigmaris@gmail.com
Headers show
Series rockchip: Fix SPI boot on Pinebook Pro, Puma and RK3399-ROC-PC | expand

Message

Hugh Cole-Baker Nov. 22, 2020, 1:03 p.m. UTC 
Commit c4cea2bbf995 ("rockchip: Enable building a SPI ROM image on bob")
added an alias spi1 referring to spi@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(-)