diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-03 00:25:03 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-03 00:25:03 +0200 |
| commit | f365ad5fc001cbd02968a376e0aecffe52ce79e1 (patch) | |
| tree | 8677f1409e36c30f0f105249a63bf11d3993f32f /arch/powerpc/boot/dts/mpc8610_hpcd.dts | |
| parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | [POWERPC] Fix DMA nodes in the MPC8610 HPCD device tree (diff) | |
| download | linux-f365ad5fc001cbd02968a376e0aecffe52ce79e1.tar.xz linux-f365ad5fc001cbd02968a376e0aecffe52ce79e1.zip | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Fix DMA nodes in the MPC8610 HPCD device tree
[POWERPC] Export empty_zero_page and copy_page in arch/ppc
[POWERPC] Add "memory" clobber to MMIO accessors
[POWERPC] pasemi: update pasemi_defconfig, enable electra_cf
electra_cf: Add MODULE_DEVICE_TABLE()
Diffstat (limited to 'arch/powerpc/boot/dts/mpc8610_hpcd.dts')
| -rw-r--r-- | arch/powerpc/boot/dts/mpc8610_hpcd.dts | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/powerpc/boot/dts/mpc8610_hpcd.dts b/arch/powerpc/boot/dts/mpc8610_hpcd.dts index 08a780d89807..fa9b6bbeb5af 100644 --- a/arch/powerpc/boot/dts/mpc8610_hpcd.dts +++ b/arch/powerpc/boot/dts/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>; |