aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/boot/dts/mpc832x_rdb.dts
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-18 16:00:54 -0400
committerIngo Molnar <mingo@elte.hu>2008-07-18 16:00:54 -0400
commitbb2c018b09b681d43f5e08124b83e362647ea82b (patch)
treed794902c78f9fdd04ed88a4b8d451ed6f9292ec0 /arch/powerpc/boot/dts/mpc832x_rdb.dts
parent82638844d9a8581bbf33201cc209a14876eca167 (diff)
parent5b664cb235e97afbf34db9c4d77f08ebd725335e (diff)
Merge branch 'linus' into cpus4096
Conflicts: drivers/acpi/processor_throttling.c Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/powerpc/boot/dts/mpc832x_rdb.dts')
-rw-r--r--arch/powerpc/boot/dts/mpc832x_rdb.dts86
1 files changed, 59 insertions, 27 deletions
diff --git a/arch/powerpc/boot/dts/mpc832x_rdb.dts b/arch/powerpc/boot/dts/mpc832x_rdb.dts
index 179c81c6a7ac..e74c045a0f8c 100644
--- a/arch/powerpc/boot/dts/mpc832x_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts
@@ -68,7 +68,7 @@
68 compatible = "fsl-i2c"; 68 compatible = "fsl-i2c";
69 reg = <0x3000 0x100>; 69 reg = <0x3000 0x100>;
70 interrupts = <14 0x8>; 70 interrupts = <14 0x8>;
71 interrupt-parent = <&pic>; 71 interrupt-parent = <&ipic>;
72 dfsrr; 72 dfsrr;
73 }; 73 };
74 74
@@ -79,7 +79,7 @@
79 reg = <0x4500 0x100>; 79 reg = <0x4500 0x100>;
80 clock-frequency = <0>; 80 clock-frequency = <0>;
81 interrupts = <9 0x8>; 81 interrupts = <9 0x8>;
82 interrupt-parent = <&pic>; 82 interrupt-parent = <&ipic>;
83 }; 83 };
84 84
85 serial1: serial@4600 { 85 serial1: serial@4600 {
@@ -89,24 +89,56 @@
89 reg = <0x4600 0x100>; 89 reg = <0x4600 0x100>;
90 clock-frequency = <0>; 90 clock-frequency = <0>;
91 interrupts = <10 0x8>; 91 interrupts = <10 0x8>;
92 interrupt-parent = <&pic>; 92 interrupt-parent = <&ipic>;
93 };
94
95 dma@82a8 {
96 #address-cells = <1>;
97 #size-cells = <1>;
98 compatible = "fsl,mpc8323-dma", "fsl,elo-dma";
99 reg = <0x82a8 4>;
100 ranges = <0 0x8100 0x1a8>;
101 interrupt-parent = <&ipic>;
102 interrupts = <71 8>;
103 cell-index = <0>;
104 dma-channel@0 {
105 compatible = "fsl,mpc8323-dma-channel", "fsl,elo-dma-channel";
106 reg = <0 0x80>;
107 interrupt-parent = <&ipic>;
108 interrupts = <71 8>;
109 };
110 dma-channel@80 {
111 compatible = "fsl,mpc8323-dma-channel", "fsl,elo-dma-channel";
112 reg = <0x80 0x80>;
113 interrupt-parent = <&ipic>;
114 interrupts = <71 8>;
115 };
116 dma-channel@100 {
117 compatible = "fsl,mpc8323-dma-channel", "fsl,elo-dma-channel";
118 reg = <0x100 0x80>;
119 interrupt-parent = <&ipic>;
120 interrupts = <71 8>;
121 };
122 dma-channel@180 {
123 compatible = "fsl,mpc8323-dma-channel", "fsl,elo-dma-channel";
124 reg = <0x180 0x28>;
125 interrupt-parent = <&ipic>;
126 interrupts = <71 8>;
127 };
93 }; 128 };
94 129
95 crypto@30000 { 130 crypto@30000 {
96 device_type = "crypto"; 131 compatible = "fsl,sec2.2", "fsl,sec2.1", "fsl,sec2.0";
97 model = "SEC2"; 132 reg = <0x30000 0x10000>;
98 compatible = "talitos";
99 reg = <0x30000 0x7000>;
100 interrupts = <11 0x8>; 133 interrupts = <11 0x8>;
101 interrupt-parent = <&pic>; 134 interrupt-parent = <&ipic>;
102 /* Rev. 2.2 */ 135 fsl,num-channels = <1>;
103 num-channels = <1>; 136 fsl,channel-fifo-len = <24>;
104 channel-fifo-len = <24>; 137 fsl,exec-units-mask = <0x4c>;
105 exec-units-mask = <0x0000004c>; 138 fsl,descriptor-types-mask = <0x0122003f>;
106 descriptor-types-mask = <0x0122003f>;
107 }; 139 };
108 140
109 pic:pic@700 { 141 ipic:pic@700 {
110 interrupt-controller; 142 interrupt-controller;
111 #address-cells = <0>; 143 #address-cells = <0>;
112 #interrupt-cells = <2>; 144 #interrupt-cells = <2>;
@@ -240,13 +272,13 @@
240 compatible = "fsl,ucc-mdio"; 272 compatible = "fsl,ucc-mdio";
241 273
242 phy00:ethernet-phy@00 { 274 phy00:ethernet-phy@00 {
243 interrupt-parent = <&pic>; 275 interrupt-parent = <&ipic>;
244 interrupts = <0>; 276 interrupts = <0>;
245 reg = <0x0>; 277 reg = <0x0>;
246 device_type = "ethernet-phy"; 278 device_type = "ethernet-phy";
247 }; 279 };
248 phy04:ethernet-phy@04 { 280 phy04:ethernet-phy@04 {
249 interrupt-parent = <&pic>; 281 interrupt-parent = <&ipic>;
250 interrupts = <0>; 282 interrupts = <0>;
251 reg = <0x4>; 283 reg = <0x4>;
252 device_type = "ethernet-phy"; 284 device_type = "ethernet-phy";
@@ -261,7 +293,7 @@
261 reg = <0x80 0x80>; 293 reg = <0x80 0x80>;
262 big-endian; 294 big-endian;
263 interrupts = <32 0x8 33 0x8>; //high:32 low:33 295 interrupts = <32 0x8 33 0x8>; //high:32 low:33
264 interrupt-parent = <&pic>; 296 interrupt-parent = <&ipic>;
265 }; 297 };
266 }; 298 };
267 299
@@ -270,21 +302,21 @@
270 interrupt-map-mask = <0xf800 0x0 0x0 0x7>; 302 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
271 interrupt-map = < 303 interrupt-map = <
272 /* IDSEL 0x10 AD16 (USB) */ 304 /* IDSEL 0x10 AD16 (USB) */
273 0x8000 0x0 0x0 0x1 &pic 17 0x8 305 0x8000 0x0 0x0 0x1 &ipic 17 0x8
274 306
275 /* IDSEL 0x11 AD17 (Mini1)*/ 307 /* IDSEL 0x11 AD17 (Mini1)*/
276 0x8800 0x0 0x0 0x1 &pic 18 0x8 308 0x8800 0x0 0x0 0x1 &ipic 18 0x8
277 0x8800 0x0 0x0 0x2 &pic 19 0x8 309 0x8800 0x0 0x0 0x2 &ipic 19 0x8
278 0x8800 0x0 0x0 0x3 &pic 20 0x8 310 0x8800 0x0 0x0 0x3 &ipic 20 0x8
279 0x8800 0x0 0x0 0x4 &pic 48 0x8 311 0x8800 0x0 0x0 0x4 &ipic 48 0x8
280 312
281 /* IDSEL 0x12 AD18 (PCI/Mini2) */ 313 /* IDSEL 0x12 AD18 (PCI/Mini2) */
282 0x9000 0x0 0x0 0x1 &pic 19 0x8 314 0x9000 0x0 0x0 0x1 &ipic 19 0x8
283 0x9000 0x0 0x0 0x2 &pic 20 0x8 315 0x9000 0x0 0x0 0x2 &ipic 20 0x8
284 0x9000 0x0 0x0 0x3 &pic 48 0x8 316 0x9000 0x0 0x0 0x3 &ipic 48 0x8
285 0x9000 0x0 0x0 0x4 &pic 17 0x8>; 317 0x9000 0x0 0x0 0x4 &ipic 17 0x8>;
286 318
287 interrupt-parent = <&pic>; 319 interrupt-parent = <&ipic>;
288 interrupts = <66 0x8>; 320 interrupts = <66 0x8>;
289 bus-range = <0x0 0x0>; 321 bus-range = <0x0 0x0>;
290 ranges = <0x42000000 0x0 0x80000000 0x80000000 0x0 0x10000000 322 ranges = <0x42000000 0x0 0x80000000 0x80000000 0x0 0x10000000
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-25 03:55:23 -0500