From aa1988f0cab55df0f4c88f1dac04962c99b78606 Mon Sep 17 00:00:00 2001 From: Gerard Marull-Paretas Date: Mon, 11 Jul 2022 12:38:53 +0200 Subject: [PATCH] boards: riscv: hifive: disable spi0 and flash0 by default When flash connected to spi0 is used as ROM Flash, it can't be instantiated. spi0 is in fact disabled now with CONFIG_SIFIVE_SPI_0_ROM, which defaults to y. However, the child flash device is not. This causes issues with tests relying on `jedec,spi-nor` because they can't find a parent device. Signed-off-by: Gerard Marull-Paretas --- boards/riscv/hifive1/hifive1.dts | 4 ++-- boards/riscv/hifive1_revb/hifive1_revb.dts | 4 ++-- boards/riscv/hifive_unleashed/hifive_unleashed.dts | 4 ++-- boards/riscv/hifive_unmatched/hifive_unmatched.dts | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/boards/riscv/hifive1/hifive1.dts b/boards/riscv/hifive1/hifive1.dts index ed151edba8..a9ad2f529d 100644 --- a/boards/riscv/hifive1/hifive1.dts +++ b/boards/riscv/hifive1/hifive1.dts @@ -50,12 +50,12 @@ pinctrl-names = "default"; }; +/* disabled (used by Flash ROM by default) */ &spi0 { - status = "okay"; - reg = <0x10014000 0x1000 0x20400000 0xc00000>; flash0: flash@0 { compatible = "issi,is25lp128", "jedec,spi-nor"; + status = "disabled"; size = <134217728>; label = "FLASH0"; jedec-id = [96 60 18]; diff --git a/boards/riscv/hifive1_revb/hifive1_revb.dts b/boards/riscv/hifive1_revb/hifive1_revb.dts index 0fed8c8d3b..350944e79e 100644 --- a/boards/riscv/hifive1_revb/hifive1_revb.dts +++ b/boards/riscv/hifive1_revb/hifive1_revb.dts @@ -92,12 +92,12 @@ current-speed = <115200>; }; +/* disabled (used by Flash ROM by default) */ &spi0 { - status = "okay"; - reg = <0x10014000 0x1000 0x20010000 0x3c0900>; flash0: flash@0 { compatible = "issi,is25lp128", "jedec,spi-nor"; + status = "disabled"; size = <134217728>; label = "FLASH0"; jedec-id = [96 60 18]; diff --git a/boards/riscv/hifive_unleashed/hifive_unleashed.dts b/boards/riscv/hifive_unleashed/hifive_unleashed.dts index e929968df8..83851bb328 100644 --- a/boards/riscv/hifive_unleashed/hifive_unleashed.dts +++ b/boards/riscv/hifive_unleashed/hifive_unleashed.dts @@ -46,12 +46,12 @@ current-speed = <115200>; }; +/* disabled (used by Flash ROM by default) */ &spi0 { - status = "okay"; - reg = <0x10040000 0x1000 0x20000000 0x2000000>; flash0: flash@0 { compatible = "issi,is25wp256d", "jedec,spi-nor"; + status = "disabled"; size = <33554432>; label = "FLASH0"; jedec-id = [96 60 18]; diff --git a/boards/riscv/hifive_unmatched/hifive_unmatched.dts b/boards/riscv/hifive_unmatched/hifive_unmatched.dts index d5b5cd4511..a32bf10266 100644 --- a/boards/riscv/hifive_unmatched/hifive_unmatched.dts +++ b/boards/riscv/hifive_unmatched/hifive_unmatched.dts @@ -27,12 +27,12 @@ current-speed = <115200>; }; +/* disabled (used by Flash ROM by default) */ &spi0 { - status = "okay"; - reg = <0x10040000 0x1000 0x20000000 0x2000000>; flash0: flash@0 { compatible = "issi,is25wp256d", "jedec,spi-nor"; + status = "disabled"; size = <33554432>; label = "FLASH0"; jedec-id = [96 60 18];