]> git.itanic.dy.fi Git - linux-stable/commitdiff
ARM: dts: imx6qdl-kontron-samx6i: fix spi-flash compatible
authorMarco Felsch <m.felsch@pengutronix.de>
Tue, 26 Jul 2022 13:05:22 +0000 (15:05 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 20 Sep 2022 10:38:30 +0000 (12:38 +0200)
[ Upstream commit af7d78c957017f8b3a0986769f6f18e57f9362ea ]

Drop the "winbond,w25q16dw" compatible since it causes to set the
MODALIAS to w25q16dw which is not specified within spi-nor id table.
Fix this by use the common "jedec,spi-nor" compatible.

Fixes: 2125212785c9 ("ARM: dts: imx6qdl-kontron-samx6i: add Kontron SMARC SoM Support")
Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi

index 02ab8a59df23a31e7d758cc9e652a7f79a0ce34e..37d94aa45a8b72e9e161cac90beca9ce8969c28e 100644 (file)
@@ -249,7 +249,7 @@ &ecspi4 {
 
        /* default boot source: workaround #1 for errata ERR006282 */
        smarc_flash: flash@0 {
-               compatible = "winbond,w25q16dw", "jedec,spi-nor";
+               compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <20000000>;
        };