Re: [PATCH] Fix DMA nodes in the MPC8610 HPCD device tree

2008-05-31 Thread Josh Boyer
On Sat, 31 May 2008 15:27:30 +1000
Paul Mackerras <[EMAIL PROTECTED]> wrote:

> Does anyone else have any pending fixes for 2.6.26?

I don't.

josh
___
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev


Re: [PATCH] Fix DMA nodes in the MPC8610 HPCD device tree

2008-05-30 Thread Kumar Gala


On May 31, 2008, at 12:27 AM, Paul Mackerras wrote:


Timur Tabi writes:

The node for DMA2 in the MPC8610 HPCD device tree has the wrong  
compatible

properties.  This breaks the DMA driver and the sound driver.

Signed-off-by: Timur Tabi <[EMAIL PROTECTED]>
---

I have no idea how I let this bug slip in, but this is a must-fix  
for 2.6.26.


Kumar, do you have anything else for 2.6.26 at the moment?  If not,
and this patch is OK with you, I'll put it in along with Olof's two
patches and send them to Linus.

Does anyone else have any pending fixes for 2.6.26?


I don't.  I want/need to do defconfig updates but that can wait if you  
plan on getting this out over the weekend.


- k
___
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev


Re: [PATCH] Fix DMA nodes in the MPC8610 HPCD device tree

2008-05-30 Thread Paul Mackerras
Timur Tabi writes:

> The node for DMA2 in the MPC8610 HPCD device tree has the wrong compatible
> properties.  This breaks the DMA driver and the sound driver.
> 
> Signed-off-by: Timur Tabi <[EMAIL PROTECTED]>
> ---
> 
> I have no idea how I let this bug slip in, but this is a must-fix for 2.6.26.

Kumar, do you have anything else for 2.6.26 at the moment?  If not,
and this patch is OK with you, I'll put it in along with Olof's two
patches and send them to Linus.

Does anyone else have any pending fixes for 2.6.26?

Paul.
___
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev


[PATCH] Fix DMA nodes in the MPC8610 HPCD device tree

2008-05-30 Thread Timur Tabi
The node for DMA2 in the MPC8610 HPCD device tree has the wrong compatible
properties.  This breaks the DMA driver and the sound driver.

Signed-off-by: Timur Tabi <[EMAIL PROTECTED]>
---

I have no idea how I let this bug slip in, but this is a must-fix for 2.6.26.

 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 08a780d..fa9b6bb 100644
--- a/arch/powerpc/boot/dts/mpc8610_hpcd.dts
+++ b/arch/powerpc/boot/dts/mpc8610_hpcd.dts
@@ -251,14 +251,14 @@
[EMAIL PROTECTED] {
#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>;
 
[EMAIL PROTECTED] {
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 @@
};
[EMAIL PROTECTED] {
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 @@
};
[EMAIL PROTECTED] {
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 @@
};
[EMAIL PROTECTED] {
compatible = "fsl,mpc8610-dma-channel",
-   "fsl,mpc8540-dma-channel";
+   "fsl,eloplus-dma-channel";
cell-index = <3>;
reg = <0x180 0x80>;
interrupt-parent = <&mpic>;
-- 
1.5.5

___
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev