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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
[pandora-kernel.git]
/
arch
/
powerpc
/
boot
/
dts
/
mpc8610_hpcd.dts
diff --git
a/arch/powerpc/boot/dts/mpc8610_hpcd.dts
b/arch/powerpc/boot/dts/mpc8610_hpcd.dts
index
981941e
..
584a4f1
100644
(file)
--- a/
arch/powerpc/boot/dts/mpc8610_hpcd.dts
+++ b/
arch/powerpc/boot/dts/mpc8610_hpcd.dts
@@
-202,6
+202,11
@@
fsl,has-rstcr;
};
fsl,has-rstcr;
};
+ wdt@e4000 {
+ compatible = "fsl,mpc8610-wdt";
+ reg = <0xe4000 0x100>;
+ };
+
i2s@16000 {
compatible = "fsl,mpc8610-ssi";
cell-index = <0>;
i2s@16000 {
compatible = "fsl,mpc8610-ssi";
cell-index = <0>;
@@
-276,7
+281,7
@@
cell-index = <0>;
reg = <0x0 0x80>;
interrupt-parent = <&mpic>;
cell-index = <0>;
reg = <0x0 0x80>;
interrupt-parent = <&mpic>;
- interrupts = <
60
2>;
+ interrupts = <
76
2>;
};
dma-channel@1 {
compatible = "fsl,mpc8610-dma-channel",
};
dma-channel@1 {
compatible = "fsl,mpc8610-dma-channel",
@@
-284,7
+289,7
@@
cell-index = <1>;
reg = <0x80 0x80>;
interrupt-parent = <&mpic>;
cell-index = <1>;
reg = <0x80 0x80>;
interrupt-parent = <&mpic>;
- interrupts = <
61
2>;
+ interrupts = <
77
2>;
};
dma-channel@2 {
compatible = "fsl,mpc8610-dma-channel",
};
dma-channel@2 {
compatible = "fsl,mpc8610-dma-channel",
@@
-292,7
+297,7
@@
cell-index = <2>;
reg = <0x100 0x80>;
interrupt-parent = <&mpic>;
cell-index = <2>;
reg = <0x100 0x80>;
interrupt-parent = <&mpic>;
- interrupts = <
62
2>;
+ interrupts = <
78
2>;
};
dma-channel@3 {
compatible = "fsl,mpc8610-dma-channel",
};
dma-channel@3 {
compatible = "fsl,mpc8610-dma-channel",
@@
-300,7
+305,7
@@
cell-index = <3>;
reg = <0x180 0x80>;
interrupt-parent = <&mpic>;
cell-index = <3>;
reg = <0x180 0x80>;
interrupt-parent = <&mpic>;
- interrupts = <
63
2>;
+ interrupts = <
79
2>;
};
};
};
};
@@
-388,6
+393,20
@@
0x01000000 0x0 0x00000000
0x01000000 0x0 0x00000000
0x0 0x00100000>;
0x01000000 0x0 0x00000000
0x01000000 0x0 0x00000000
0x0 0x00100000>;
+
+ isa@1e {
+ device_type = "isa";
+ #size-cells = <1>;
+ #address-cells = <2>;
+ reg = <0xf000 0 0 0 0>;
+ ranges = <1 0 0x01000000 0 0
+ 0x00001000>;
+
+ rtc@70 {
+ compatible = "pnpPNP,b00";
+ reg = <1 0x70 2>;
+ };
+ };
};
};
};
};
};
};