summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/boot
diff options
context:
space:
mode:
Diffstat (limited to 'arch/powerpc/boot')
-rw-r--r--arch/powerpc/boot/Makefile4
-rw-r--r--arch/powerpc/boot/dts/mpc8610_hpcd.dts10
2 files changed, 7 insertions, 7 deletions
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index c40fb82d575c..c3585bed1970 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -221,8 +221,8 @@ image-$(CONFIG_WARP) += cuImage.warp
221image-$(CONFIG_YOSEMITE) += cuImage.yosemite 221image-$(CONFIG_YOSEMITE) += cuImage.yosemite
222 222
223# Board ports in arch/powerpc/platform/8xx/Kconfig 223# Board ports in arch/powerpc/platform/8xx/Kconfig
224image-$(CONFIG_PPC_MPC86XADS) += cuImage.mpc866ads 224image-$(CONFIG_MPC86XADS) += cuImage.mpc866ads
225image-$(CONFIG_PPC_MPC885ADS) += cuImage.mpc885ads 225image-$(CONFIG_MPC885ADS) += cuImage.mpc885ads
226image-$(CONFIG_PPC_EP88XC) += dtbImage.ep88xc 226image-$(CONFIG_PPC_EP88XC) += dtbImage.ep88xc
227image-$(CONFIG_PPC_ADDER875) += cuImage.adder875-uboot \ 227image-$(CONFIG_PPC_ADDER875) += cuImage.adder875-uboot \
228 dtbImage.adder875-redboot 228 dtbImage.adder875-redboot
diff --git a/arch/powerpc/boot/dts/mpc8610_hpcd.dts b/arch/powerpc/boot/dts/mpc8610_hpcd.dts
index 186f102bfb47..65a5f64b2339 100644
--- a/arch/powerpc/boot/dts/mpc8610_hpcd.dts
+++ b/arch/powerpc/boot/dts/mpc8610_hpcd.dts
@@ -265,14 +265,14 @@
265 dma@c300 { 265 dma@c300 {
266 #address-cells = <1>; 266 #address-cells = <1>;
267 #size-cells = <1>; 267 #size-cells = <1>;
268 compatible = "fsl,mpc8610-dma", "fsl,mpc8540-dma"; 268 compatible = "fsl,mpc8610-dma", "fsl,eloplus-dma";
269 cell-index = <1>; 269 cell-index = <1>;
270 reg = <0xc300 0x4>; /* DMA general status register */ 270 reg = <0xc300 0x4>; /* DMA general status register */
271 ranges = <0x0 0xc100 0x200>; 271 ranges = <0x0 0xc100 0x200>;
272 272
273 dma-channel@0 { 273 dma-channel@0 {
274 compatible = "fsl,mpc8610-dma-channel", 274 compatible = "fsl,mpc8610-dma-channel",
275 "fsl,mpc8540-dma-channel"; 275 "fsl,eloplus-dma-channel";
276 cell-index = <0>; 276 cell-index = <0>;
277 reg = <0x0 0x80>; 277 reg = <0x0 0x80>;
278 interrupt-parent = <&mpic>; 278 interrupt-parent = <&mpic>;
@@ -280,7 +280,7 @@
280 }; 280 };
281 dma-channel@1 { 281 dma-channel@1 {
282 compatible = "fsl,mpc8610-dma-channel", 282 compatible = "fsl,mpc8610-dma-channel",
283 "fsl,mpc8540-dma-channel"; 283 "fsl,eloplus-dma-channel";
284 cell-index = <1>; 284 cell-index = <1>;
285 reg = <0x80 0x80>; 285 reg = <0x80 0x80>;
286 interrupt-parent = <&mpic>; 286 interrupt-parent = <&mpic>;
@@ -288,7 +288,7 @@
288 }; 288 };
289 dma-channel@2 { 289 dma-channel@2 {
290 compatible = "fsl,mpc8610-dma-channel", 290 compatible = "fsl,mpc8610-dma-channel",
291 "fsl,mpc8540-dma-channel"; 291 "fsl,eloplus-dma-channel";
292 cell-index = <2>; 292 cell-index = <2>;
293 reg = <0x100 0x80>; 293 reg = <0x100 0x80>;
294 interrupt-parent = <&mpic>; 294 interrupt-parent = <&mpic>;
@@ -296,7 +296,7 @@
296 }; 296 };
297 dma-channel@3 { 297 dma-channel@3 {
298 compatible = "fsl,mpc8610-dma-channel", 298 compatible = "fsl,mpc8610-dma-channel",
299 "fsl,mpc8540-dma-channel"; 299 "fsl,eloplus-dma-channel";
300 cell-index = <3>; 300 cell-index = <3>;
301 reg = <0x180 0x80>; 301 reg = <0x180 0x80>;
302 interrupt-parent = <&mpic>; 302 interrupt-parent = <&mpic>;