diff mbox

[v2] powerpc/p1023: set IRQ[4:6, 11] to active-high level sensitive for PCIe

Message ID 1321506575-21730-1-git-send-email-galak@kernel.crashing.org (mailing list archive)
State Accepted, archived
Commit c3c3ced77fd1949af753be7731bfdadae88a226b
Delegated to: Kumar Gala
Headers show

Commit Message

Kumar Gala Nov. 17, 2011, 5:09 a.m. UTC 
From: Roy Zang <tie-fei.zang@freescale.com>

P1023 external IRQ[4:6, 11] are not pin out, but the interrupts are
utilized by the PCIe controllers.  As they are not exposed as pins we
need to set them as active-high (internal to the SoC these interrupts
are pulled down).

IRQs[0:3,7:10] are pulled up on the board so we have them set as
active-low.

Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
v2:
* cleaned up commit message & added comments to be clear about IRQ usage

 arch/powerpc/boot/dts/p1023rds.dts |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

Comments

Kumar Gala Nov. 20, 2011, 3:51 p.m. UTC | #1 
On Nov 16, 2011, at 11:09 PM, Kumar Gala wrote:

> From: Roy Zang <tie-fei.zang@freescale.com>
> 
> P1023 external IRQ[4:6, 11] are not pin out, but the interrupts are
> utilized by the PCIe controllers.  As they are not exposed as pins we
> need to set them as active-high (internal to the SoC these interrupts
> are pulled down).
> 
> IRQs[0:3,7:10] are pulled up on the board so we have them set as
> active-low.
> 
> Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
> ---
> v2:
> * cleaned up commit message & added comments to be clear about IRQ usage

applied to merge

- k
diff mbox

Patch

diff --git a/arch/powerpc/boot/dts/p1023rds.dts b/arch/powerpc/boot/dts/p1023rds.dts
index 25f9897..319c4b4 100644
--- a/arch/powerpc/boot/dts/p1023rds.dts
+++ b/arch/powerpc/boot/dts/p1023rds.dts
@@ -698,6 +698,7 @@ 
 			interrupt-parent = <&mpic>;
 			interrupts = <16 2>;
 			interrupt-map-mask = <0xf800 0 0 7>;
+			/* IRQ[0:3] are pulled up on board, set to active-low */
 			interrupt-map = <
 				/* IDSEL 0x0 */
 				0000 0 0 1 &mpic 0 1
@@ -737,11 +738,15 @@ 
 			interrupt-parent = <&mpic>;
 			interrupts = <16 2>;
 			interrupt-map-mask = <0xf800 0 0 7>;
+			/*
+			 * IRQ[4:6] only for PCIe, set to active-high,
+			 * IRQ[7] is pulled up on board, set to active-low
+			 */
 			interrupt-map = <
 				/* IDSEL 0x0 */
-				0000 0 0 1 &mpic 4 1
-				0000 0 0 2 &mpic 5 1
-				0000 0 0 3 &mpic 6 1
+				0000 0 0 1 &mpic 4 2
+				0000 0 0 2 &mpic 5 2
+				0000 0 0 3 &mpic 6 2
 				0000 0 0 4 &mpic 7 1
 				>;
 			ranges = <0x2000000 0x0 0xa0000000
@@ -776,12 +781,16 @@ 
 			interrupt-parent = <&mpic>;
 			interrupts = <16 2>;
 			interrupt-map-mask = <0xf800 0 0 7>;
+			/*
+			 * IRQ[8:10] are pulled up on board, set to active-low
+			 * IRQ[11] only for PCIe, set to active-high,
+			 */
 			interrupt-map = <
 				/* IDSEL 0x0 */
 				0000 0 0 1 &mpic 8 1
 				0000 0 0 2 &mpic 9 1
 				0000 0 0 3 &mpic 10 1
-				0000 0 0 4 &mpic 11 1
+				0000 0 0 4 &mpic 11 2
 				>;
 			ranges = <0x2000000 0x0 0x80000000
 				  0x2000000 0x0 0x80000000