Unverified Commit ddae25ed authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'socfpga_fix_for_v5.16_part_2' of... 

Merge tag 'socfpga_fix_for_v5.16_part_2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into arm/fixes

SoCFPGA fix for v5.16, part 2
- Fix QSPI dts entry to include "jedec,spi-nor"

* tag 'socfpga_fix_for_v5.16_part_2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  ARM: socfpga: dts: fix qspi node compatible

Link: https://lore.kernel.org/r/20211203181007.3138381-1-dinguyen@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents b257c5f0 cb25b119

arch/arm/boot/dts/socfpga_arria10_socdk_qspi.dts

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
	flash0: n25q00@0 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "n25q00aa";

		compatible = "micron,mt25qu02g", "jedec,spi-nor";

		reg = <0>;

		spi-max-frequency = <100000000>;

arch/arm/boot/dts/socfpga_arria5_socdk.dts

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ 
	flash: flash@0 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "n25q256a";

		compatible = "micron,n25q256a", "jedec,spi-nor";

		reg = <0>;

		spi-max-frequency = <100000000>;

arch/arm/boot/dts/socfpga_cyclone5_socdk.dts

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ 
	flash0: n25q00@0 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "n25q00";

		compatible = "micron,mt25qu02g", "jedec,spi-nor";

		reg = <0>;	/* chip select */

		spi-max-frequency = <100000000>;

arch/arm/boot/dts/socfpga_cyclone5_sockit.dts

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ 
	flash: flash@0 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "n25q00";

		compatible = "micron,mt25qu02g", "jedec,spi-nor";

		reg = <0>;

		spi-max-frequency = <100000000>;

arch/arm/boot/dts/socfpga_cyclone5_socrates.dts

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ 
	flash: flash@0 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "n25q256a";

		compatible = "micron,n25q256a", "jedec,spi-nor";

		reg = <0>;

		spi-max-frequency = <100000000>;

		m25p,fast-read;