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 'mvebu-dt-5.1-2' of git://git.infradead.org/linux-mvebu into arm/dt
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
tegra114-dalmore.dts
diff --git
a/arch/arm/boot/dts/tegra114-dalmore.dts
b/arch/arm/boot/dts/tegra114-dalmore.dts
index 1788556b497790e5bee3fe7f643e43198f9ad1da..97a5c3504bbeb38b0ba496570c28a4ff42ddd4be 100644
(file)
--- a/
arch/arm/boot/dts/tegra114-dalmore.dts
+++ b/
arch/arm/boot/dts/tegra114-dalmore.dts
@@
-1087,7
+1087,7
@@
status = "okay";
spi-max-frequency = <25000000>;
spi-flash@0 {
- compatible = "winbond,w25q32dw";
+ compatible = "winbond,w25q32dw"
, "jedec,spi-nor"
;
reg = <0>;
spi-max-frequency = <20000000>;
};