FAILED: patch "[PATCH] arm64: dts: agilex/stratix10: Fix qspi node compatible" failed to apply to 5.4-stable tree

PATCH [email protected] 1 participant 1 message Nov 23, 2020

Subsystems (3)

Stable branch Device tree bindings Arm/socfpga architecture

lore

Share & tools

lore

[email protected]

author maintainer

2020-11-23 08:51 UTC #0 lore raw

The patch below does not apply to the 5.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From f126b6702e7354d6247a36f20b9172457af5c15a Mon Sep 17 00:00:00 2001
From: Dinh Nguyen <[email protected]>
Date: Sun, 1 Nov 2020 14:02:56 -0600
Subject: [PATCH] arm64: dts: agilex/stratix10: Fix qspi node compatible

The QSPI flash node needs to have the required "jedec,spi-nor" in the compatible string.

Fixes 0cb140d07fc7 ("arm64: dts: stratix10: Add QSPI support for Stratix10")

Cc [email protected]

Signed-off-by Dinh Nguyen <[email protected]>

arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts +1 -1

index feadd21bc0dc..46e558ab7729 100644
@@ -159,7 +159,7 @@ &qspi {
 	flash@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
-		compatible = "n25q00a";
+		compatible = "micron,mt25qu02g", "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <100000000>;

arch/arm64/boot/dts/altera/socfpga_stratix10_socdk_nand.dts +1 -1

index c07966740e14..f9b4a39683cf 100644
@@ -192,7 +192,7 @@ &qspi {
 	flash@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
-		compatible = "n25q00a";
+		compatible = "micron,mt25qu02g", "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <100000000>;

arch/arm64/boot/dts/intel/socfpga_agilex_socdk.dts +1 -1

index 96c50d48289d..a7a83f29f00b 100644
@@ -110,7 +110,7 @@ &qspi {
 	flash@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
-		compatible = "mt25qu02g";
+		compatible = "micron,mt25qu02g", "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <100000000>;