git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6
[pandora-kernel.git]
/
arch
/
powerpc
/
boot
/
dts
/
p4080ds.dts
diff --git
a/arch/powerpc/boot/dts/p4080ds.dts
b/arch/powerpc/boot/dts/p4080ds.dts
index
2f0de24
..
5b7fc29
100644
(file)
--- a/
arch/powerpc/boot/dts/p4080ds.dts
+++ b/
arch/powerpc/boot/dts/p4080ds.dts
@@
-236,22
+236,19
@@
};
spi@110000 {
};
spi@110000 {
- cell-index = <0>;
#address-cells = <1>;
#size-cells = <0>;
#address-cells = <1>;
#size-cells = <0>;
- compatible = "fsl,espi";
+ compatible = "fsl,
p4080-espi", "fsl,mpc8536-
espi";
reg = <0x110000 0x1000>;
interrupts = <53 0x2>;
interrupt-parent = <&mpic>;
reg = <0x110000 0x1000>;
interrupts = <53 0x2>;
interrupt-parent = <&mpic>;
- espi,num-ss-bits = <4>;
- mode = "cpu";
+ fsl,espi-num-chipselects = <4>;
- f
sl_m25p80
@0 {
+ f
lash
@0 {
#address-cells = <1>;
#size-cells = <1>;
#address-cells = <1>;
#size-cells = <1>;
- compatible = "
fsl,espi-flash
";
+ compatible = "
spansion,s25sl12801
";
reg = <0>;
reg = <0>;
- linux,modalias = "fsl_m25p80";
spi-max-frequency = <40000000>; /* input clock */
partition@u-boot {
label = "u-boot";
spi-max-frequency = <40000000>; /* input clock */
partition@u-boot {
label = "u-boot";