Patchwork powerpc: fix interrupt values for DMA2 in MPC8610 HPCD device tree

login
register
mail settings
Submitter Timur Tabi
Date Sept. 9, 2008, 7:43 p.m.
Message ID <1220989419-26861-1-git-send-email-timur@freescale.com>
Download mbox | patch
Permalink /patch/223/
State Accepted, archived
Delegated to: Kumar Gala
Headers show

Comments

Timur Tabi - Sept. 9, 2008, 7:43 p.m.
For Freescale 8xxx devices that use an MPIC, the interrupt numbers in the
device tree must be 16 greater than the values documented in the reference
manual.  In these chips, the MPIC is wired to use the first 16 numbers for
external interrupts, but the documentation numbers internal interrupts from 0.

In the MPC8610 HPCD device tree, the interrupt properties for the DMA channels
for DMA2 were not the adjusted values.  This patch fixes that.

Signed-off-by: Timur Tabi <timur@freescale.com>
Kumar Gala - Sept. 12, 2008, 8:45 p.m.
On Sep 9, 2008, at 2:43 PM, Timur Tabi wrote:

> For Freescale 8xxx devices that use an MPIC, the interrupt numbers  
> in the
> device tree must be 16 greater than the values documented in the  
> reference
> manual.  In these chips, the MPIC is wired to use the first 16  
> numbers for
> external interrupts, but the documentation numbers internal  
> interrupts from 0.
>
> In the MPC8610 HPCD device tree, the interrupt properties for the  
> DMA channels
> for DMA2 were not the adjusted values.  This patch fixes that.
>
> Signed-off-by: Timur Tabi <timur@freescale.com>
> ---
>
> I have no idea how this was missed for so long, but this patch is a
> must-fix for 2.6.27.
>
> (changes for v2: improve changelog text)
>
> arch/powerpc/boot/dts/mpc8610_hpcd.dts |    8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)

applied.

- k

Patch

diff --git a/arch/powerpc/boot/dts/mpc8610_hpcd.dts b/arch/powerpc/boot/dts/mpc8610_hpcd.dts
index 3b3a106..584a4f1 100644
--- a/arch/powerpc/boot/dts/mpc8610_hpcd.dts
+++ b/arch/powerpc/boot/dts/mpc8610_hpcd.dts
@@ -281,7 +281,7 @@ 
 				cell-index = <0>;
 				reg = <0x0 0x80>;
 				interrupt-parent = <&mpic>;
-				interrupts = <60 2>;
+				interrupts = <76 2>;
 			};
 			dma-channel@1 {
 				compatible = "fsl,mpc8610-dma-channel",
@@ -289,7 +289,7 @@ 
 				cell-index = <1>;
 				reg = <0x80 0x80>;
 				interrupt-parent = <&mpic>;
-				interrupts = <61 2>;
+				interrupts = <77 2>;
 			};
 			dma-channel@2 {
 				compatible = "fsl,mpc8610-dma-channel",
@@ -297,7 +297,7 @@ 
 				cell-index = <2>;
 				reg = <0x100 0x80>;
 				interrupt-parent = <&mpic>;
-				interrupts = <62 2>;
+				interrupts = <78 2>;
 			};
 			dma-channel@3 {
 				compatible = "fsl,mpc8610-dma-channel",
@@ -305,7 +305,7 @@ 
 				cell-index = <3>;
 				reg = <0x180 0x80>;
 				interrupt-parent = <&mpic>;
-				interrupts = <63 2>;
+				interrupts = <79 2>;
 			};
 		};