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 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
powerpc
/
boot
/
dts
/
p1010si.dtsi
diff --git
a/arch/powerpc/boot/dts/p1010si.dtsi
b/arch/powerpc/boot/dts/p1010si.dtsi
index
7f51104
..
cabe0a4
100644
(file)
--- a/
arch/powerpc/boot/dts/p1010si.dtsi
+++ b/
arch/powerpc/boot/dts/p1010si.dtsi
@@
-140,20
+140,18
@@
interrupt-parent = <&mpic>;
};
interrupt-parent = <&mpic>;
};
- can0@1c000 {
- compatible = "fsl,
flexcan-v1.0
";
+ can0
: can
@1c000 {
+ compatible = "fsl,
p1010-flexcan
";
reg = <0x1c000 0x1000>;
interrupts = <48 0x2>;
interrupt-parent = <&mpic>;
reg = <0x1c000 0x1000>;
interrupts = <48 0x2>;
interrupt-parent = <&mpic>;
- fsl,flexcan-clock-divider = <2>;
};
};
- can1@1d000 {
- compatible = "fsl,
flexcan-v1.0
";
+ can1
: can
@1d000 {
+ compatible = "fsl,
p1010-flexcan
";
reg = <0x1d000 0x1000>;
interrupts = <61 0x2>;
interrupt-parent = <&mpic>;
reg = <0x1d000 0x1000>;
interrupts = <61 0x2>;
interrupt-parent = <&mpic>;
- fsl,flexcan-clock-divider = <2>;
};
L2: l2-cache-controller@20000 {
};
L2: l2-cache-controller@20000 {