diff options
author | Paul Mackerras <paulus@samba.org> | 2008-10-31 10:34:56 (GMT) |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-10-31 10:34:56 (GMT) |
commit | bfb99f8258b5981ef7a2ec8099db56317ea16695 (patch) | |
tree | 2449e0968a1a14fe519475bfa29a5c4e3a60e23d | |
parent | ebdba9af940d63e469dc8e46b4aa1fc474e8ee2d (diff) | |
parent | 65325d5c45a4363b4ad2ce2a55793a131b667de6 (diff) | |
download | linux-bfb99f8258b5981ef7a2ec8099db56317ea16695.tar.xz |
Merge branch 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into merge
-rw-r--r-- | arch/powerpc/boot/dts/mpc8313erdb.dts | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/arch/powerpc/boot/dts/mpc8313erdb.dts b/arch/powerpc/boot/dts/mpc8313erdb.dts index 747f276..5030317 100644 --- a/arch/powerpc/boot/dts/mpc8313erdb.dts +++ b/arch/powerpc/boot/dts/mpc8313erdb.dts @@ -164,45 +164,6 @@ mode = "cpu"; }; - dma@82a8 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "fsl,mpc8313-dma", "fsl,elo-dma"; - reg = <0x82a8 4>; - ranges = <0 0x8100 0x1a8>; - interrupt-parent = <&ipic>; - interrupts = <71 8>; - cell-index = <0>; - dma-channel@0 { - compatible = "fsl,mpc8313-dma-channel", "fsl,elo-dma-channel"; - reg = <0 0x80>; - cell-index = <0>; - interrupt-parent = <&ipic>; - interrupts = <71 8>; - }; - dma-channel@80 { - compatible = "fsl,mpc8313-dma-channel", "fsl,elo-dma-channel"; - reg = <0x80 0x80>; - cell-index = <1>; - interrupt-parent = <&ipic>; - interrupts = <71 8>; - }; - dma-channel@100 { - compatible = "fsl,mpc8313-dma-channel", "fsl,elo-dma-channel"; - reg = <0x100 0x80>; - cell-index = <2>; - interrupt-parent = <&ipic>; - interrupts = <71 8>; - }; - dma-channel@180 { - compatible = "fsl,mpc8313-dma-channel", "fsl,elo-dma-channel"; - reg = <0x180 0x28>; - cell-index = <3>; - interrupt-parent = <&ipic>; - interrupts = <71 8>; - }; - }; - /* phy type (ULPI, UTMI, UTMI_WIDE, SERIAL) */ usb@23000 { compatible = "fsl-usb2-dr"; |