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 branches 'work.misc' and 'work.dcache' of git://git.kernel.org/pub/scm/linux...
[sfrench/cifs-2.6.git]
/
arch
/
mips
/
boot
/
dts
/
mscc
/
ocelot_pcb123.dts
diff --git
a/arch/mips/boot/dts/mscc/ocelot_pcb123.dts
b/arch/mips/boot/dts/mscc/ocelot_pcb123.dts
index 4ccd65379059910f3a142f8e69ffdf9a1c811f31..2266027759f989fe1187ddc4be42ec5ccf08cf1a 100644
(file)
--- a/
arch/mips/boot/dts/mscc/ocelot_pcb123.dts
+++ b/
arch/mips/boot/dts/mscc/ocelot_pcb123.dts
@@
-26,6
+26,16
@@
status = "okay";
};
+&spi {
+ status = "okay";
+
+ flash@0 {
+ compatible = "macronix,mx25l25635f", "jedec,spi-nor";
+ spi-max-frequency = <20000000>;
+ reg = <0>;
+ };
+};
+
&mdio0 {
status = "okay";
};