Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Arnd Bergmann <arnd@arndb.de>

+2 -2
+2 -2
arch/arm/boot/dts/vf610-bk4.dts
··· 246 246 reg = <0>; 247 247 }; 248 248 249 - n25q128a13_2: flash@1 { 249 + n25q128a13_2: flash@2 { 250 250 compatible = "n25q128a13", "jedec,spi-nor"; 251 251 #address-cells = <1>; 252 252 #size-cells = <1>; 253 253 spi-max-frequency = <66000000>; 254 254 spi-rx-bus-width = <2>; 255 - reg = <1>; 255 + reg = <2>; 256 256 }; 257 257 }; 258 258