Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ebc52623 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-fixes-5.3-2' of... 

Merge tag 'imx-fixes-5.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes

i.MX fixes for 5.3, round 2:
 - A fix on vf610-bk4 board qspi device description to get SPI-NOR
   memory recognized correctly.

* tag 'imx-fixes-5.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: dts: vf610-bk4: Fix qspi node description

Link: https://lore.kernel.org/r/20190812160020.GA12364@X250


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

arch/arm/boot/dts/vf610-bk4.dts

+2 −2
Original line number Diff line number Diff line
@@ -246,13 +246,13 @@ 
		reg = <0>;

	};



	n25q128a13_2: flash@1 {

	n25q128a13_2: flash@2 {

		compatible = "n25q128a13", "jedec,spi-nor";

		#address-cells = <1>;

		#size-cells = <1>;

		spi-max-frequency = <66000000>;

		spi-rx-bus-width = <2>;

		reg = <1>;

		reg = <2>;

	};

};