From: Florian Fainelli Date: Wed, 26 Aug 2020 23:45:29 +0000 (-0700) Subject: ARM: dts: BCM5301X: Fixed QSPI compatible string X-Git-Tag: v4.14.199~88 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7290cb1a3aa67dcc43fecf66dae64eb2ebad18af;p=users%2Fdwmw2%2Flinux.git ARM: dts: BCM5301X: Fixed QSPI compatible string [ Upstream commit b793dab8d811e103665d6bddaaea1c25db3776eb ] The string was incorrectly defined before from least to most specific, swap the compatible strings accordingly. Fixes: 1c8f40650723 ("ARM: dts: BCM5301X: convert to iProc QSPI") Signed-off-by: Florian Fainelli Signed-off-by: Sasha Levin --- diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi index 501877e87a5b8..dffa8b9bd536d 100644 --- a/arch/arm/boot/dts/bcm5301x.dtsi +++ b/arch/arm/boot/dts/bcm5301x.dtsi @@ -426,7 +426,7 @@ }; spi@18029200 { - compatible = "brcm,spi-bcm-qspi", "brcm,spi-nsp-qspi"; + compatible = "brcm,spi-nsp-qspi", "brcm,spi-bcm-qspi"; reg = <0x18029200 0x184>, <0x18029000 0x124>, <0x1811b408 0x004>,