git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'armsoc-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
versatile-ab.dts
diff --git
a/arch/arm/boot/dts/versatile-ab.dts
b/arch/arm/boot/dts/versatile-ab.dts
index d23320af5ea79772fcb4f9c69cb0b6682ecddf1f..409e069b3a845667df387c1decc7c811aa8359bd 100644
(file)
--- a/
arch/arm/boot/dts/versatile-ab.dts
+++ b/
arch/arm/boot/dts/versatile-ab.dts
@@
-119,8
+119,9
@@
};
flash@34000000 {
- compatible = "arm,versatile-flash";
- reg = <0x34000000 0x4000000>;
+ /* 64 MiB NOR flash in non-interleaved chips */
+ compatible = "arm,versatile-flash", "cfi-flash";
+ reg = <0x34000000 0x04000000>;
bank-width = <4>;
};