aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2008-10-31 06:34:56 -0400
committerPaul Mackerras <paulus@samba.org>2008-10-31 06:34:56 -0400
commitbfb99f8258b5981ef7a2ec8099db56317ea16695 (patch)
tree2449e0968a1a14fe519475bfa29a5c4e3a60e23d /arch/powerpc
parentebdba9af940d63e469dc8e46b4aa1fc474e8ee2d (diff)
parent65325d5c45a4363b4ad2ce2a55793a131b667de6 (diff)
Merge branch 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into merge
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/boot/dts/mpc8313erdb.dts39
1 files changed, 0 insertions, 39 deletions
diff --git a/arch/powerpc/boot/dts/mpc8313erdb.dts b/arch/powerpc/boot/dts/mpc8313erdb.dts
index 747f27676332..503031766825 100644
--- a/arch/powerpc/boot/dts/mpc8313erdb.dts
+++ b/arch/powerpc/boot/dts/mpc8313erdb.dts
@@ -164,45 +164,6 @@
164 mode = "cpu"; 164 mode = "cpu";
165 }; 165 };
166 166
167 dma@82a8 {
168 #address-cells = <1>;
169 #size-cells = <1>;
170 compatible = "fsl,mpc8313-dma", "fsl,elo-dma";
171 reg = <0x82a8 4>;
172 ranges = <0 0x8100 0x1a8>;
173 interrupt-parent = <&ipic>;
174 interrupts = <71 8>;
175 cell-index = <0>;
176 dma-channel@0 {
177 compatible = "fsl,mpc8313-dma-channel", "fsl,elo-dma-channel";
178 reg = <0 0x80>;
179 cell-index = <0>;
180 interrupt-parent = <&ipic>;
181 interrupts = <71 8>;
182 };
183 dma-channel@80 {
184 compatible = "fsl,mpc8313-dma-channel", "fsl,elo-dma-channel";
185 reg = <0x80 0x80>;
186 cell-index = <1>;
187 interrupt-parent = <&ipic>;
188 interrupts = <71 8>;
189 };
190 dma-channel@100 {
191 compatible = "fsl,mpc8313-dma-channel", "fsl,elo-dma-channel";
192 reg = <0x100 0x80>;
193 cell-index = <2>;
194 interrupt-parent = <&ipic>;
195 interrupts = <71 8>;
196 };
197 dma-channel@180 {
198 compatible = "fsl,mpc8313-dma-channel", "fsl,elo-dma-channel";
199 reg = <0x180 0x28>;
200 cell-index = <3>;
201 interrupt-parent = <&ipic>;
202 interrupts = <71 8>;
203 };
204 };
205
206 /* phy type (ULPI, UTMI, UTMI_WIDE, SERIAL) */ 167 /* phy type (ULPI, UTMI, UTMI_WIDE, SERIAL) */
207 usb@23000 { 168 usb@23000 {
208 compatible = "fsl-usb2-dr"; 169 compatible = "fsl-usb2-dr";