commit 3d43d6b450bc3b40e45b593b9cbd0588b0740a31
author Ian Campbell <ijc@hellion.org.uk> Wed Jun 04 20:10:44 2008 -0700
committer Ian Campbell <ijc@hellion.org.uk> Thu Sep 28 12:12:41 2017 +0100
tree 3fe9cf83fd2b3b5e2fe23fe0156dfc99805e2f81
parent cae0295f1fcc09d5cc40c68f5f3d6ce9d8e5a276
parent 1cba1dd8a90568ebc154e4554dc68975053eecaa

Merge tag 'v2.6.26-rc5-dts-raw'

Linux 2.6.26-rc5

src/powerpc/mpc8610_hpcd.dts

diff --git a/src/powerpc/mpc8610_hpcd.dts b/src/powerpc/mpc8610_hpcd.dts
index 08a780d..fa9b6bb 100644
--- a/src/powerpc/mpc8610_hpcd.dts
+++ b/src/powerpc/mpc8610_hpcd.dts
@@ -251,14 +251,14 @@
 		dma@c300 {
 			#address-cells = <1>;
 			#size-cells = <1>;
-			compatible = "fsl,mpc8610-dma", "fsl,mpc8540-dma";
+			compatible = "fsl,mpc8610-dma", "fsl,eloplus-dma";
 			cell-index = <1>;
 			reg = <0xc300 0x4>; /* DMA general status register */
 			ranges = <0x0 0xc100 0x200>;
 
 			dma-channel@0 {
 				compatible = "fsl,mpc8610-dma-channel",
-					"fsl,mpc8540-dma-channel";
+					"fsl,eloplus-dma-channel";
 				cell-index = <0>;
 				reg = <0x0 0x80>;
 				interrupt-parent = <&mpic>;
@@ -266,7 +266,7 @@
 			};
 			dma-channel@1 {
 				compatible = "fsl,mpc8610-dma-channel",
-					"fsl,mpc8540-dma-channel";
+					"fsl,eloplus-dma-channel";
 				cell-index = <1>;
 				reg = <0x80 0x80>;
 				interrupt-parent = <&mpic>;
@@ -274,7 +274,7 @@
 			};
 			dma-channel@2 {
 				compatible = "fsl,mpc8610-dma-channel",
-					"fsl,mpc8540-dma-channel";
+					"fsl,eloplus-dma-channel";
 				cell-index = <2>;
 				reg = <0x100 0x80>;
 				interrupt-parent = <&mpic>;
@@ -282,7 +282,7 @@
 			};
 			dma-channel@3 {
 				compatible = "fsl,mpc8610-dma-channel",
-					"fsl,mpc8540-dma-channel";
+					"fsl,eloplus-dma-channel";
 				cell-index = <3>;
 				reg = <0x180 0x80>;
 				interrupt-parent = <&mpic>;