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 'imx/compile-fixes' of git://git.linaro.org/people/shawnguo/linux-2...
[pandora-kernel.git]
/
arch
/
powerpc
/
boot
/
dts
/
p3041ds.dts
diff --git
a/arch/powerpc/boot/dts/p3041ds.dts
b/arch/powerpc/boot/dts/p3041ds.dts
index
69cae67
..
bbd113b
100644
(file)
--- a/
arch/powerpc/boot/dts/p3041ds.dts
+++ b/
arch/powerpc/boot/dts/p3041ds.dts
@@
-45,6
+45,10
@@
device_type = "memory";
};
device_type = "memory";
};
+ dcsr: dcsr@f00000000 {
+ ranges = <0x00000000 0xf 0x00000000 0x01008000>;
+ };
+
soc: soc@ffe000000 {
spi@110000 {
flash@0 {
soc: soc@ffe000000 {
spi@110000 {
flash@0 {
@@
-147,8
+151,8
@@
};
board-control@3,0 {
};
board-control@3,0 {
- compatible = "fsl,p3041ds-pixis";
- reg = <3 0 0x
2
0>;
+ compatible = "fsl,p3041ds-
fpga", "fsl,fpga-ng
pixis";
+ reg = <3 0 0x
3
0>;
};
};
};
};