From 24c2776ba9002fadbf7cf86a0f5bc6a17cc08290 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sat, 18 May 2019 11:59:49 -0600 Subject: [PATCH] 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 Fixes: cd35365762 (mtd: sf_probe: remove spi-flash compatible) --- arch/sandbox/dts/sandbox.dtsi | 2 +- drivers/spi/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/sandbox/dts/sandbox.dtsi b/arch/sandbox/dts/sandbox.dtsi index ebc4ece824..2fb365d86e 100644 --- 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 f9b282313a..8e1424ba42 100644 --- 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"; }; -- 2.25.1