Spi0 is not needed in SPL and SPL could be a little smaller without it,
but then the SF_DEFAULT_BOOT would have to be 0 to refer to spi1, and
that's confusing, because once U-Boot proper runs, it numbers the bus 1.

Add spi0 to the pre-reloc and spl trees so that the flash is always
connected to bus 1.

Changes since v1:
   - new patch in v2.

Signed-off-by: Xavier Drudis Ferran <xdru...@tinet.cat>

Cc: Simon Glass <s...@chromium.org>
Cc: Philipp Tomsich <philipp.toms...@vrull.eu>
Cc: Kever Yang <kever.y...@rock-chips.com>

---
 arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi 
b/arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi
index 4c2fe8f6bc..68b6b752d6 100644
--- a/arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi
+++ b/arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi
@@ -16,6 +16,12 @@
        regulator-init-microvolt = <950000>;
 };
 
+/* not needed, but nicer to keep SF_DEFAULT_BUS in SPL the same index as in 
U-Boot proper */
+&spi0 {
+       u-boot,dm-pre-reloc;
+       status = "okay";
+};
+
 &spi1 {
        status = "okay";
        spi-max-frequency = <40000000>;
-- 
2.20.1

Reply via email to