diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-09-02 20:30:09 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-09-02 20:30:09 +0300 |
commit | 99097a214b0c15f7595ac8f2788662f3941c1992 (patch) | |
tree | 9e496a96ea36ccd9e97509878fadeecd671e28aa /arch/arm/boot/dts/vf610-bk4.dts | |
parent | d4e34999a7571e0a8d43cec6a0f13ecf40d3b1e8 (diff) | |
parent | 089cf7f6ecb266b6a4164919a2e69bd2f938374a (diff) | |
download | linux-99097a214b0c15f7595ac8f2788662f3941c1992.tar.xz |
Merge 5.3-rc7 into char-misc-next
We need the fixes in here as well for testing and merges
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/boot/dts/vf610-bk4.dts')
-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>; }; }; |