sandbox: Correct spi flash operation

Since the SPI nor conversion, 'sf probe' does not work on sandbox. Fix
this by using the expected compatible string in the flash node.

Signed-off-by: Simon Glass <sjg@chromium.org>
Fixes: cd35365762 (mtd: sf_probe: remove spi-flash compatible)

diff --git a/arch/sandbox/dts/sandbox.dtsi b/arch/sandbox/dts/sandbox.dtsi
index ebc4ece8248d2a07cb3db2264a36163dd50942c6..2fb365d86e89b41ff6f0a1a0abe392e165c6de5e 100644 (file)
--- a/arch/sandbox/dts/sandbox.dtsi
+++ b/arch/sandbox/dts/sandbox.dtsi
@@ -150,7 +150,7 @@
                firmware_storage_spi: flash@0 {
                        u-boot,dm-pre-reloc;
                        reg = <0>;
-                       compatible = "spansion,m25p16", "sandbox,spi-flash";
+                       compatible = "spansion,m25p16", "jedec,spi-nor";
                        spi-max-frequency = <40000000>;
                        sandbox,filename = "spi.bin";
                };

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index f9b282313a2edb5f3e0bd214f711288406792c24..8e1424ba42b00b90dcf7ce522c882e9f8cf86785 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -226,7 +226,7 @@ config SANDBOX_SPI
                cs-gpios = <0>, <&gpio_a 0>;
                flash@0 {
                        reg = <0>;
-                       compatible = "spansion,m25p16", "sandbox,spi-flash";
+                       compatible = "spansion,m25p16", "jedec,spi-nor";
                        spi-max-frequency = <40000000>;
                        sandbox,filename = "spi.bin";
                };