Patchwork Fix mpc8536ds dma interrupt numbers

login
register
mail settings
Submitter Ed Swarthout
Date Oct. 17, 2008, 5:41 a.m.
Message ID <1224222092-9301-1-git-send-email-Ed.Swarthout@freescale.com>
Download mbox | patch
Permalink /patch/4803/
State Accepted
Delegated to: Kumar Gala
Headers show

Comments

Ed Swarthout - Oct. 17, 2008, 5:41 a.m.
Swap pci1 and pci2 labels -
Per user manual, pcie1 is at a000 and pcie2 is at 9000.

Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
---
 arch/powerpc/boot/dts/mpc8536ds.dts |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)
Kumar Gala - Oct. 17, 2008, 6:32 a.m.
On Oct 17, 2008, at 12:41 AM, Ed Swarthout wrote:

> Swap pci1 and pci2 labels -
> Per user manual, pcie1 is at a000 and pcie2 is at 9000.

the pcie labels are correct.. they DO NOT reflect the UMs.  (as that  
number is just silly).

- k
Kumar Gala - Oct. 20, 2008, 2:46 p.m.
On Oct 17, 2008, at 12:41 AM, Ed Swarthout wrote:

> Swap pci1 and pci2 labels -
> Per user manual, pcie1 is at a000 and pcie2 is at 9000.
>
> Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
> ---
> arch/powerpc/boot/dts/mpc8536ds.dts |   12 ++++++------
> 1 files changed, 6 insertions(+), 6 deletions(-)

applied, dropped the pci changes.

- k

Patch

diff --git a/arch/powerpc/boot/dts/mpc8536ds.dts b/arch/powerpc/boot/dts/mpc8536ds.dts
index 93fdd99..ac4233a 100644
--- a/arch/powerpc/boot/dts/mpc8536ds.dts
+++ b/arch/powerpc/boot/dts/mpc8536ds.dts
@@ -109,7 +109,7 @@ 
 				reg = <0x0 0x80>;
 				cell-index = <0>;
 				interrupt-parent = <&mpic>;
-				interrupts = <14 0x2>;
+				interrupts = <20 2>;
 			};
 			dma-channel@80 {
 				compatible = "fsl,mpc8536-dma-channel",
@@ -117,7 +117,7 @@ 
 				reg = <0x80 0x80>;
 				cell-index = <1>;
 				interrupt-parent = <&mpic>;
-				interrupts = <15 0x2>;
+				interrupts = <21 2>;
 			};
 			dma-channel@100 {
 				compatible = "fsl,mpc8536-dma-channel",
@@ -125,7 +125,7 @@ 
 				reg = <0x100 0x80>;
 				cell-index = <2>;
 				interrupt-parent = <&mpic>;
-				interrupts = <16 0x2>;
+				interrupts = <22 2>;
 			};
 			dma-channel@180 {
 				compatible = "fsl,mpc8536-dma-channel",
@@ -133,7 +133,7 @@ 
 				reg = <0x180 0x80>;
 				cell-index = <3>;
 				interrupt-parent = <&mpic>;
-				interrupts = <17 0x2>;
+				interrupts = <23 2>;
 			};
 		};
 
@@ -321,7 +321,7 @@ 
 		reg = <0xffe08000 0x1000>;
 	};
 
-	pci1: pcie@ffe09000 {
+	pci2: pcie@ffe09000 {
 		cell-index = <1>;
 		compatible = "fsl,mpc8548-pcie";
 		device_type = "pci";
@@ -358,7 +358,7 @@ 
 		};
 	};
 
-	pci2: pcie@ffe0a000 {
+	pci1: pcie@ffe0a000 {
 		cell-index = <2>;
 		compatible = "fsl,mpc8548-pcie";
 		device_type = "pci";