diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2019-08-13 14:05:09 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2019-08-13 14:05:10 +0200 |
| commit | ebc526233b9dd2a5aefdc012048b56f09481e460 (patch) | |
| tree | cd13be714d1949673d9ea12279f7d0c258c46b42 /arch | |
| parent | Linux 5.3-rc4 (diff) | |
| parent | ARM: dts: vf610-bk4: Fix qspi node description (diff) | |
| download | linux-ebc526233b9dd2a5aefdc012048b56f09481e460.tar.xz linux-ebc526233b9dd2a5aefdc012048b56f09481e460.zip | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/vf610-bk4.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/vf610-bk4.dts b/arch/arm/boot/dts/vf610-bk4.dts index 3fa0cbe456db..0f3870d3b099 100644 --- a/arch/arm/boot/dts/vf610-bk4.dts +++ b/arch/arm/boot/dts/vf610-bk4.dts @@ -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>; }; }; |