Commit 53bbff26 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'socfpga_fix_for_v5.10' of... 

Merge tag 'socfpga_fix_for_v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux

 into arm/fixes

arm64: dts: fix for v5.10
- Fix the qspi node to have the required "jedec,spi-nor"

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

arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ 
	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
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ 
	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
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ 
	flash@0 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "mt25qu02g";

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

		reg = <0>;

		spi-max-frequency = <100000000>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE