Skip to contentSkip to conversation

arm: socfpga: cyclone5: Ensure spi-flash in the compatible string

PATCH Superseded chin.liang.see at intel.com 3 participants 3 messages Feb 21, 2018 Arm (32-bit)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 2/2 arm: socfpga: cyclone5: Ensure spi-flash in the compatible string

From: Chin Liang See <[email protected]>

Ensure "spi-flash" is added into compatible string when there is NOR flash being instantiated in DTS. Discovered "sf probe" command without argument would hit error if spi-flash compatible string is missing.

---
 arch/arm/dts/socfpga_cyclone5_is1.dts      | 2 +-
 arch/arm/dts/socfpga_cyclone5_socdk.dts    | 2 +-
 arch/arm/dts/socfpga_cyclone5_socrates.dts | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/dts/socfpga_cyclone5_is1.dts +1 -1
index 2e2b71f..549024c 100644
@@ -87,7 +87,7 @@
 		u-boot,dm-pre-reloc;
 		#address-cells = <1>;
 		#size-cells = <1>;
-		compatible = "n25q00";
+		compatible = "n25q00","spi-flash";
 		reg = <0>;      /* chip select */
 		spi-max-frequency = <100000000>;
 		m25p,fast-read;
arch/arm/dts/socfpga_cyclone5_socdk.dts +1 -1
index 95a8e65..e30bf9a 100644
@@ -98,7 +98,7 @@
 		u-boot,dm-pre-reloc;
 		#address-cells = <1>;
 		#size-cells = <1>;
-		compatible = "n25q00";
+		compatible = "n25q00","spi-flash";
 		reg = <0>;      /* chip select */
 		spi-max-frequency = <100000000>;
 		m25p,fast-read;
arch/arm/dts/socfpga_cyclone5_socrates.dts +1 -1
index e3ae8a8..3e78038 100644
@@ -68,7 +68,7 @@
 	flash0: n25q00 at 0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
-		compatible = "n25q00";
+		compatible = "n25q00","spi-flash";
 		reg = <0>;      /* chip select */
 		spi-max-frequency = <50000000>;
 		m25p,fast-read;
Signature · 1 line
2.2.2
#1 lore raw

PATCH 2/2 arm: socfpga: cyclone5: Ensure spi-flash in the compatible string

Quoted 6 lines · chin.liang.see at intel.com

From: Chin Liang See <[email protected]>

Ensure "spi-flash" is added into compatible string when there is NOR flash being instantiated in DTS. Discovered "sf probe" command without argument would hit error if spi-flash compatible string is missing.

This has already been fixed 5 days ago.

Simon

Quoted 47 lines
---
  arch/arm/dts/socfpga_cyclone5_is1.dts      | 2 +-
  arch/arm/dts/socfpga_cyclone5_socdk.dts    | 2 +-
  arch/arm/dts/socfpga_cyclone5_socrates.dts | 2 +-
  3 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/dts/socfpga_cyclone5_is1.dts +1 -1
index 2e2b71f..549024c 100644
@@ -87,7 +87,7 @@
  		u-boot,dm-pre-reloc;
  		#address-cells = <1>;
  		#size-cells = <1>;
-		compatible = "n25q00";
+		compatible = "n25q00","spi-flash";
  		reg = <0>;      /* chip select */
  		spi-max-frequency = <100000000>;
  		m25p,fast-read;
arch/arm/dts/socfpga_cyclone5_socdk.dts +1 -1
index 95a8e65..e30bf9a 100644
@@ -98,7 +98,7 @@
  		u-boot,dm-pre-reloc;
  		#address-cells = <1>;
  		#size-cells = <1>;
-		compatible = "n25q00";
+		compatible = "n25q00","spi-flash";
  		reg = <0>;      /* chip select */
  		spi-max-frequency = <100000000>;
  		m25p,fast-read;
arch/arm/dts/socfpga_cyclone5_socrates.dts +1 -1
index e3ae8a8..3e78038 100644
@@ -68,7 +68,7 @@
  	flash0: n25q00 at 0 {
  		#address-cells = <1>;
  		#size-cells = <1>;
-		compatible = "n25q00";
+		compatible = "n25q00","spi-flash";
  		reg = <0>;      /* chip select */
  		spi-max-frequency = <50000000>;
  		m25p,fast-read;
#2 lore raw

PATCH 2/2 arm: socfpga: cyclone5: Ensure spi-flash in the compatible string

Quoted 10 lines · Simon Goldschmidt
Quoted 7 lines · chin.liang.see at intel.com

From: Chin Liang See <[email protected]>

Ensure "spi-flash" is added into compatible string when there is NOR flash being instantiated in DTS. Discovered "sf probe" command without argument would hit error if spi-flash compatible string is missing.

This has already been fixed 5 days ago.

Nice and thanks for the patch.
I was pulling from the source few days back for enabling the Macronix flash and bumping into this same issue.

Thanks
Chin Liang

Quoted 53 lines

Simon

Quoted 51 lines

---
  arch/arm/dts/socfpga_cyclone5_is1.dts      | 2 +- arch/arm/dts/socfpga_cyclone5_socdk.dts    | 2 +- arch/arm/dts/socfpga_cyclone5_socrates.dts | 2 +-

  3 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/dts/socfpga_cyclone5_is1.dts +1 -1
index 2e2b71f..549024c 100644
@@ -87,7 +87,7 @@
   		u-boot,dm-pre-reloc;
   		#address-cells = <1>;
   		#size-cells = <1>;
-		compatible = "n25q00";
+		compatible = "n25q00","spi-flash";

   reg = <0>;      /* chip select */
   spi-max-frequency = <100000000>;
   m25p,fast-read;

arch/arm/dts/socfpga_cyclone5_socdk.dts +1 -1
index 95a8e65..e30bf9a 100644
@@ -98,7 +98,7 @@
   		u-boot,dm-pre-reloc;
   		#address-cells = <1>;
   		#size-cells = <1>;
-		compatible = "n25q00";
+		compatible = "n25q00","spi-flash";

   reg = <0>;      /* chip select */
   spi-max-frequency = <100000000>;
   m25p,fast-read;

arch/arm/dts/socfpga_cyclone5_socrates.dts +1 -1
index e3ae8a8..3e78038 100644
@@ -68,7 +68,7 @@
   	flash0: n25q00 at 0 {
   		#address-cells = <1>;
   		#size-cells = <1>;
-		compatible = "n25q00";
+		compatible = "n25q00","spi-flash";

   reg = <0>;      /* chip select */
   spi-max-frequency = <50000000>;
   m25p,fast-read;