From: Chris Packham Date: Tue, 29 Aug 2017 08:37:54 +0000 (+1200) Subject: ARM: mvebu: add "spi-flash" compatible string X-Git-Tag: v2017.09-rc4~40^2 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=dbc3e64fd1d416395def9b555a9b76e84d6f44f3;p=oweals%2Fu-boot.git ARM: mvebu: add "spi-flash" compatible string U-boots spi-nor support is currently considered a work in progress. For now to avoid issues it is necessary to add a "spi-flash" compatible string. Eventually the "jedec,spi-nor" will be sufficient when the core U-boot code is updated to support it. Signed-off-by: Chris Packham Reviewed-by: Jagan Teki Signed-off-by: Stefan Roese --- diff --git a/arch/arm/dts/armada-385-amc.dts b/arch/arm/dts/armada-385-amc.dts index 4649c910c7..5e1588d574 100644 --- a/arch/arm/dts/armada-385-amc.dts +++ b/arch/arm/dts/armada-385-amc.dts @@ -154,7 +154,7 @@ u-boot,dm-pre-reloc; #address-cells = <1>; #size-cells = <1>; - compatible = "st,m25p128", "jedec,spi-nor"; + compatible = "st,m25p128", "jedec,spi-nor", "spi-flash"; reg = <0>; /* Chip select 0 */ spi-max-frequency = <50000000>; m25p,fast-read;