Patchwork [MPC8313ERDB] Remove duplicate DMA entry from device tree

login
register
mail settings
Submitter Mike Dyer
Date Oct. 29, 2008, 10:10 a.m.
Message ID <1225275006.8152.16.camel@mike-linux.provision-comm.com>
Download mbox | patch
Permalink /patch/6235/
State Accepted
Headers show

Comments

Mike Dyer - Oct. 29, 2008, 10:10 a.m.
Signed-off-by: Mike Dyer <mike.dyer@provision-comm.com>
---
arch/powerpc/boot/dts/mpc8313erdb.dts |   39 ---------------------------------
 1 files changed, 0 insertions(+), 39 deletions(-)
Kumar Gala - Oct. 31, 2008, 7:39 a.m.
On Oct 29, 2008, at 5:10 AM, Mike Dyer wrote:

>
> Signed-off-by: Mike Dyer <mike.dyer@provision-comm.com>
> ---
> arch/powerpc/boot/dts/mpc8313erdb.dts |   39  
> ---------------------------------
> 1 files changed, 0 insertions(+), 39 deletions(-)

applied for 2.6.28

- k

Patch

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";