diff mbox series

[v1,5/7] powerpc: dts: fsl: Use IRQ flags for legacy PCI IRQ interrupts

Message ID 20191104163834.8932-6-andrew.murray@arm.com (mailing list archive)
State Not Applicable
Headers show
Series PCI: dt: Remove magic numbers for legacy PCI IRQ interrupts | expand

Commit Message

Andrew Murray Nov. 4, 2019, 4:38 p.m. UTC 
Replace magic numbers used to describe legacy PCI IRQ interrupts
with #define.

Signed-off-by: Andrew Murray <andrew.murray@arm.com>
---
 arch/powerpc/boot/dts/fsl/b4420qds.dts        |   4 +-
 arch/powerpc/boot/dts/fsl/b4420si-post.dtsi   |   2 +-
 arch/powerpc/boot/dts/fsl/b4860qds.dts        |   4 +-
 arch/powerpc/boot/dts/fsl/b4860si-post.dtsi   |   2 +-
 arch/powerpc/boot/dts/fsl/b4qds.dtsi          |   2 +-
 arch/powerpc/boot/dts/fsl/b4si-post.dtsi      |  12 +-
 arch/powerpc/boot/dts/fsl/bsc9132qds.dts      |   2 +-
 arch/powerpc/boot/dts/fsl/bsc9132si-post.dtsi |  12 +-
 arch/powerpc/boot/dts/fsl/c293pcie.dts        |   2 +-
 arch/powerpc/boot/dts/fsl/c293si-post.dtsi    |  12 +-
 arch/powerpc/boot/dts/fsl/gef_sbc310.dts      |  12 +-
 arch/powerpc/boot/dts/fsl/mpc8536ds.dts       |  12 +-
 arch/powerpc/boot/dts/fsl/mpc8536ds_36b.dts   |  12 +-
 arch/powerpc/boot/dts/fsl/mpc8540ads.dts      | 100 ++++++------
 arch/powerpc/boot/dts/fsl/mpc8544ds.dts       |  22 +--
 arch/powerpc/boot/dts/fsl/mpc8544ds.dtsi      |  22 +--
 arch/powerpc/boot/dts/fsl/mpc8548cds_32b.dts  |  14 +-
 arch/powerpc/boot/dts/fsl/mpc8548cds_36b.dts  |  14 +-
 arch/powerpc/boot/dts/fsl/mpc8548si-post.dtsi |  12 +-
 arch/powerpc/boot/dts/fsl/mpc8560ads.dts      | 100 ++++++------
 arch/powerpc/boot/dts/fsl/mpc8568mds.dts      |  22 +--
 arch/powerpc/boot/dts/fsl/mpc8568si-post.dtsi |  12 +-
 arch/powerpc/boot/dts/fsl/mpc8569mds.dts      |   2 +-
 arch/powerpc/boot/dts/fsl/mpc8569si-post.dtsi |  12 +-
 arch/powerpc/boot/dts/fsl/mpc8641_hpcn.dts    | 150 +++++++++---------
 .../powerpc/boot/dts/fsl/mpc8641_hpcn_36b.dts | 150 +++++++++---------
 arch/powerpc/boot/dts/fsl/p2020ds.dts         |   2 +-
 arch/powerpc/boot/dts/fsl/p2020ds.dtsi        |  46 +++---
 arch/powerpc/boot/dts/fsl/ppa8548.dts         |   2 +-
 arch/powerpc/boot/dts/fsl/sbc8641d.dts        |   4 +-
 30 files changed, 408 insertions(+), 368 deletions(-)

Comments

Michael Ellerman Nov. 12, 2019, 12:48 p.m. UTC | #1 
Andrew Murray <andrew.murray@arm.com> writes:

> Replace magic numbers used to describe legacy PCI IRQ interrupts
> with #define.
>
> Signed-off-by: Andrew Murray <andrew.murray@arm.com>
> ---
>  arch/powerpc/boot/dts/fsl/b4420qds.dts        |   4 +-
>  arch/powerpc/boot/dts/fsl/b4420si-post.dtsi   |   2 +-
>  arch/powerpc/boot/dts/fsl/b4860qds.dts        |   4 +-
>  arch/powerpc/boot/dts/fsl/b4860si-post.dtsi   |   2 +-
>  arch/powerpc/boot/dts/fsl/b4qds.dtsi          |   2 +-
>  arch/powerpc/boot/dts/fsl/b4si-post.dtsi      |  12 +-
>  arch/powerpc/boot/dts/fsl/bsc9132qds.dts      |   2 +-
>  arch/powerpc/boot/dts/fsl/bsc9132si-post.dtsi |  12 +-
>  arch/powerpc/boot/dts/fsl/c293pcie.dts        |   2 +-
>  arch/powerpc/boot/dts/fsl/c293si-post.dtsi    |  12 +-
>  arch/powerpc/boot/dts/fsl/gef_sbc310.dts      |  12 +-
>  arch/powerpc/boot/dts/fsl/mpc8536ds.dts       |  12 +-
>  arch/powerpc/boot/dts/fsl/mpc8536ds_36b.dts   |  12 +-
>  arch/powerpc/boot/dts/fsl/mpc8540ads.dts      | 100 ++++++------
>  arch/powerpc/boot/dts/fsl/mpc8544ds.dts       |  22 +--
>  arch/powerpc/boot/dts/fsl/mpc8544ds.dtsi      |  22 +--
>  arch/powerpc/boot/dts/fsl/mpc8548cds_32b.dts  |  14 +-
>  arch/powerpc/boot/dts/fsl/mpc8548cds_36b.dts  |  14 +-
>  arch/powerpc/boot/dts/fsl/mpc8548si-post.dtsi |  12 +-
>  arch/powerpc/boot/dts/fsl/mpc8560ads.dts      | 100 ++++++------
>  arch/powerpc/boot/dts/fsl/mpc8568mds.dts      |  22 +--
>  arch/powerpc/boot/dts/fsl/mpc8568si-post.dtsi |  12 +-
>  arch/powerpc/boot/dts/fsl/mpc8569mds.dts      |   2 +-
>  arch/powerpc/boot/dts/fsl/mpc8569si-post.dtsi |  12 +-
>  arch/powerpc/boot/dts/fsl/mpc8641_hpcn.dts    | 150 +++++++++---------
>  .../powerpc/boot/dts/fsl/mpc8641_hpcn_36b.dts | 150 +++++++++---------
>  arch/powerpc/boot/dts/fsl/p2020ds.dts         |   2 +-
>  arch/powerpc/boot/dts/fsl/p2020ds.dtsi        |  46 +++---
>  arch/powerpc/boot/dts/fsl/ppa8548.dts         |   2 +-
>  arch/powerpc/boot/dts/fsl/sbc8641d.dts        |   4 +-
>  30 files changed, 408 insertions(+), 368 deletions(-)

Acked-by: Michael Ellerman <mpe@ellerman.id.au>

cheers
diff mbox series

Patch

diff --git a/arch/powerpc/boot/dts/fsl/b4420qds.dts b/arch/powerpc/boot/dts/fsl/b4420qds.dts
index cd9203ceedc0..11b6a5147538 100644
--- a/arch/powerpc/boot/dts/fsl/b4420qds.dts
+++ b/arch/powerpc/boot/dts/fsl/b4420qds.dts
@@ -33,7 +33,7 @@ 
  */
 
 /include/ "b4420si-pre.dtsi"
-/include/ "b4qds.dtsi"
+#include "b4qds.dtsi"
 
 / {
 	model = "fsl,B4420QDS";
@@ -47,4 +47,4 @@ 
 
 };
 
-/include/ "b4420si-post.dtsi"
+#include "b4420si-post.dtsi"
diff --git a/arch/powerpc/boot/dts/fsl/b4420si-post.dtsi b/arch/powerpc/boot/dts/fsl/b4420si-post.dtsi
index f996cced45e0..981585dc9026 100644
--- a/arch/powerpc/boot/dts/fsl/b4420si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/b4420si-post.dtsi
@@ -32,7 +32,7 @@ 
  * this software, even if advised of the possibility of such damage.
  */
 
-/include/ "b4si-post.dtsi"
+#include "b4si-post.dtsi"
 
 /* controller at 0x200000 */
 &pci0 {
diff --git a/arch/powerpc/boot/dts/fsl/b4860qds.dts b/arch/powerpc/boot/dts/fsl/b4860qds.dts
index a8bc419959ca..9cad8d3f3165 100644
--- a/arch/powerpc/boot/dts/fsl/b4860qds.dts
+++ b/arch/powerpc/boot/dts/fsl/b4860qds.dts
@@ -33,7 +33,7 @@ 
  */
 
 /include/ "b4860si-pre.dtsi"
-/include/ "b4qds.dtsi"
+#include "b4qds.dtsi"
 
 / {
 	model = "fsl,B4860QDS";
@@ -114,4 +114,4 @@ 
 	};
 };
 
-/include/ "b4860si-post.dtsi"
+#include "b4860si-post.dtsi"
diff --git a/arch/powerpc/boot/dts/fsl/b4860si-post.dtsi b/arch/powerpc/boot/dts/fsl/b4860si-post.dtsi
index 868719821106..8d99df9a0259 100644
--- a/arch/powerpc/boot/dts/fsl/b4860si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/b4860si-post.dtsi
@@ -32,7 +32,7 @@ 
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/include/ "b4si-post.dtsi"
+#include "b4si-post.dtsi"
 
 /* controller at 0x200000 */
 &pci0 {
diff --git a/arch/powerpc/boot/dts/fsl/b4qds.dtsi b/arch/powerpc/boot/dts/fsl/b4qds.dtsi
index 05be919f3545..0fd5a51942a3 100644
--- a/arch/powerpc/boot/dts/fsl/b4qds.dtsi
+++ b/arch/powerpc/boot/dts/fsl/b4qds.dtsi
@@ -277,4 +277,4 @@ 
 	};
 };
 
-/include/ "b4si-post.dtsi"
+#include "b4si-post.dtsi"
diff --git a/arch/powerpc/boot/dts/fsl/b4si-post.dtsi b/arch/powerpc/boot/dts/fsl/b4si-post.dtsi
index 4f044b41a776..b8c0cfe342ff 100644
--- a/arch/powerpc/boot/dts/fsl/b4si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/b4si-post.dtsi
@@ -32,6 +32,8 @@ 
  * this software, even if advised of the possibility of such damage.
  */
 
+#include <dt-bindings/interrupt-controller/irq.h>
+
 &bman_fbpr {
 	compatible = "fsl,bman-fbpr";
 	alloc-ranges = <0 0 0x10000 0>;
@@ -70,13 +72,13 @@ 
 		device_type = "pci";
 		reg = <0 0 0 0 0>;
 		interrupts = <20 2 0 0>;
-		interrupt-map-mask = <0xf800 0 0 7>;
+		interrupt-map-mask = <0xf800 0 0 IRQ_INT_ALL>;
 		interrupt-map = <
 			/* IDSEL 0x0 */
-			0000 0 0 1 &mpic 40 1 0 0
-			0000 0 0 2 &mpic 1 1 0 0
-			0000 0 0 3 &mpic 2 1 0 0
-			0000 0 0 4 &mpic 3 1 0 0
+			0000 0 0 IRQ_INTA &mpic 40 1 0 0
+			0000 0 0 IRQ_INTB &mpic 1 1 0 0
+			0000 0 0 IRQ_INTC &mpic 2 1 0 0
+			0000 0 0 IRQ_INTD &mpic 3 1 0 0
 			>;
 	};
 };
diff --git a/arch/powerpc/boot/dts/fsl/bsc9132qds.dts b/arch/powerpc/boot/dts/fsl/bsc9132qds.dts
index 7cb2158dfe58..f779118c0e2e 100644
--- a/arch/powerpc/boot/dts/fsl/bsc9132qds.dts
+++ b/arch/powerpc/boot/dts/fsl/bsc9132qds.dts
@@ -43,4 +43,4 @@ 
 };
 
 /include/ "bsc9132qds.dtsi"
-/include/ "bsc9132si-post.dtsi"
+#include "bsc9132si-post.dtsi"
diff --git a/arch/powerpc/boot/dts/fsl/bsc9132si-post.dtsi b/arch/powerpc/boot/dts/fsl/bsc9132si-post.dtsi
index b5f071574e83..0a15c7457f6d 100644
--- a/arch/powerpc/boot/dts/fsl/bsc9132si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/bsc9132si-post.dtsi
@@ -32,6 +32,8 @@ 
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <dt-bindings/interrupt-controller/irq.h>
+
 &ifc {
 	#address-cells = <2>;
 	#size-cells = <1>;
@@ -56,14 +58,14 @@ 
 		#address-cells = <3>;
 		device_type = "pci";
 		interrupts = <16 2 0 0>;
-		interrupt-map-mask = <0xf800 0 0 7>;
+		interrupt-map-mask = <0xf800 0 0 IRQ_INT_ALL>;
 
 		interrupt-map = <
 			/* IDSEL 0x0 */
-			0000 0x0 0x0 0x1 &mpic 0x0 0x2 0x0 0x0
-			0000 0x0 0x0 0x2 &mpic 0x1 0x2 0x0 0x0
-			0000 0x0 0x0 0x3 &mpic 0x2 0x2 0x0 0x0
-			0000 0x0 0x0 0x4 &mpic 0x3 0x2 0x0 0x0
+			0000 0x0 0x0 IRQ_INTA &mpic 0x0 0x2 0x0 0x0
+			0000 0x0 0x0 IRQ_INTB &mpic 0x1 0x2 0x0 0x0
+			0000 0x0 0x0 IRQ_INTC &mpic 0x2 0x2 0x0 0x0
+			0000 0x0 0x0 IRQ_INTD &mpic 0x3 0x2 0x0 0x0
 			>;
 	};
 };
diff --git a/arch/powerpc/boot/dts/fsl/c293pcie.dts b/arch/powerpc/boot/dts/fsl/c293pcie.dts
index 5e905e0857cf..3ae6b6de1eea 100644
--- a/arch/powerpc/boot/dts/fsl/c293pcie.dts
+++ b/arch/powerpc/boot/dts/fsl/c293pcie.dts
@@ -221,4 +221,4 @@ 
 		phy-connection-type = "rgmii-id";
 	};
 };
-/include/ "c293si-post.dtsi"
+#include "c293si-post.dtsi"
diff --git a/arch/powerpc/boot/dts/fsl/c293si-post.dtsi b/arch/powerpc/boot/dts/fsl/c293si-post.dtsi
index bd208320bff5..4f84478c2467 100644
--- a/arch/powerpc/boot/dts/fsl/c293si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/c293si-post.dtsi
@@ -32,6 +32,8 @@ 
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <dt-bindings/interrupt-controller/irq.h>
+
 &ifc {
 	#address-cells = <2>;
 	#size-cells = <1>;
@@ -56,13 +58,13 @@ 
 		#address-cells = <3>;
 		device_type = "pci";
 		interrupts = <16 2 0 0>;
-		interrupt-map-mask = <0xf800 0 0 7>;
+		interrupt-map-mask = <0xf800 0 0 IRQ_INT_ALL>;
 		interrupt-map = <
 			/* IDSEL 0x0 */
-			0000 0x0 0x0 0x1 &mpic 0x0 0x1 0x0 0x0
-			0000 0x0 0x0 0x2 &mpic 0x1 0x1 0x0 0x0
-			0000 0x0 0x0 0x3 &mpic 0x2 0x1 0x0 0x0
-			0000 0x0 0x0 0x4 &mpic 0x3 0x1 0x0 0x0
+			0000 0x0 0x0 IRQ_INTA &mpic 0x0 0x1 0x0 0x0
+			0000 0x0 0x0 IRQ_INTB &mpic 0x1 0x1 0x0 0x0
+			0000 0x0 0x0 IRQ_INTC &mpic 0x2 0x1 0x0 0x0
+			0000 0x0 0x0 IRQ_INTD &mpic 0x3 0x1 0x0 0x0
 			>;
 	};
 };
diff --git a/arch/powerpc/boot/dts/fsl/gef_sbc310.dts b/arch/powerpc/boot/dts/fsl/gef_sbc310.dts
index 47ae85c34635..3feb1bdc3661 100644
--- a/arch/powerpc/boot/dts/fsl/gef_sbc310.dts
+++ b/arch/powerpc/boot/dts/fsl/gef_sbc310.dts
@@ -16,6 +16,8 @@ 
 
 /include/ "mpc8641si-pre.dtsi"
 
+#include <dt-bindings/interrupt-controller/irq.h>
+
 / {
 	model = "GEF_SBC310";
 	compatible = "gef,sbc310";
@@ -195,12 +197,12 @@ 
 		reg = <0xfef08000 0x1000>;
 		ranges = <0x02000000 0x0 0x80000000 0x80000000 0x0 0x40000000
 			  0x01000000 0x0 0x00000000 0xfe000000 0x0 0x00400000>;
-		interrupt-map-mask = <0xff00 0x0 0x0 0x7>;
+		interrupt-map-mask = <0xff00 0x0 0x0 IRQ_INT_ALL>;
 		interrupt-map = <
-			0x0000 0x0 0x0 0x1 &mpic 0x0 0x2
-			0x0000 0x0 0x0 0x2 &mpic 0x1 0x2
-			0x0000 0x0 0x0 0x3 &mpic 0x2 0x2
-			0x0000 0x0 0x0 0x4 &mpic 0x3 0x2
+			0x0000 0x0 0x0 IRQ_INTA &mpic 0x0 0x2
+			0x0000 0x0 0x0 IRQ_INTB &mpic 0x1 0x2
+			0x0000 0x0 0x0 IRQ_INTC &mpic 0x2 0x2
+			0x0000 0x0 0x0 IRQ_INTD &mpic 0x3 0x2
 		>;
 
 		pcie@0 {
diff --git a/arch/powerpc/boot/dts/fsl/mpc8536ds.dts b/arch/powerpc/boot/dts/fsl/mpc8536ds.dts
index ab6997a0fd1b..69eb66ca02fa 100644
--- a/arch/powerpc/boot/dts/fsl/mpc8536ds.dts
+++ b/arch/powerpc/boot/dts/fsl/mpc8536ds.dts
@@ -7,6 +7,8 @@ 
 
 /include/ "mpc8536si-pre.dtsi"
 
+#include <dt-bindings/interrupt-controller/irq.h>
+
 / {
 	model = "fsl,mpc8536ds";
 	compatible = "fsl,mpc8536ds";
@@ -45,14 +47,14 @@ 
 		ranges = <0x02000000 0 0x80000000 0 0x80000000 0 0x10000000
 			  0x01000000 0 0x00000000 0 0xffc00000 0 0x00010000>;
 		clock-frequency = <66666666>;
-		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+		interrupt-map-mask = <0xf800 0x0 0x0 IRQ_INT_ALL>;
 		interrupt-map = <
 
 			/* IDSEL 0x11 J17 Slot 1 */
-			0x8800 0 0 1 &mpic 1 1 0 0
-			0x8800 0 0 2 &mpic 2 1 0 0
-			0x8800 0 0 3 &mpic 3 1 0 0
-			0x8800 0 0 4 &mpic 4 1 0 0>;
+			0x8800 0 0 IRQ_INTA &mpic 1 1 0 0
+			0x8800 0 0 IRQ_INTB &mpic 2 1 0 0
+			0x8800 0 0 IRQ_INTC &mpic 3 1 0 0
+			0x8800 0 0 IRQ_INTD &mpic 4 1 0 0>;
 	};
 
 	pci1: pcie@ffe09000 {
diff --git a/arch/powerpc/boot/dts/fsl/mpc8536ds_36b.dts b/arch/powerpc/boot/dts/fsl/mpc8536ds_36b.dts
index 1b799741cd46..ab853782b2bf 100644
--- a/arch/powerpc/boot/dts/fsl/mpc8536ds_36b.dts
+++ b/arch/powerpc/boot/dts/fsl/mpc8536ds_36b.dts
@@ -7,6 +7,8 @@ 
 
 /include/ "mpc8536si-pre.dtsi"
 
+#include <dt-bindings/interrupt-controller/irq.h>
+
 / {
 	model = "fsl,mpc8536ds";
 	compatible = "fsl,mpc8536ds";
@@ -45,14 +47,14 @@ 
 		ranges = <0x02000000 0 0xf0000000 0xc 0x00000000 0 0x10000000
 			  0x01000000 0 0x00000000 0xf 0xffc00000 0 0x00010000>;
 		clock-frequency = <66666666>;
-		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+		interrupt-map-mask = <0xf800 0x0 0x0 IRQ_INT_ALL>;
 		interrupt-map = <
 
 			/* IDSEL 0x11 J17 Slot 1 */
-			0x8800 0 0 1 &mpic 1 1 0 0
-			0x8800 0 0 2 &mpic 2 1 0 0
-			0x8800 0 0 3 &mpic 3 1 0 0
-			0x8800 0 0 4 &mpic 4 1 0 0>;
+			0x8800 0 0 IRQ_INTA &mpic 1 1 0 0
+			0x8800 0 0 IRQ_INTB &mpic 2 1 0 0
+			0x8800 0 0 IRQ_INTC &mpic 3 1 0 0
+			0x8800 0 0 IRQ_INTD &mpic 4 1 0 0>;
 	};
 
 	pci1: pcie@fffe09000 {
diff --git a/arch/powerpc/boot/dts/fsl/mpc8540ads.dts b/arch/powerpc/boot/dts/fsl/mpc8540ads.dts
index 18a885130538..4efc9abcc2ff 100644
--- a/arch/powerpc/boot/dts/fsl/mpc8540ads.dts
+++ b/arch/powerpc/boot/dts/fsl/mpc8540ads.dts
@@ -7,6 +7,8 @@ 
 
 /dts-v1/;
 
+#include <dt-bindings/interrupt-controller/irq.h>
+
 /include/ "e500v2_power_isa.dtsi"
 
 / {
@@ -265,80 +267,80 @@ 
 	};
 
 	pci0: pci@e0008000 {
-		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+		interrupt-map-mask = <0xf800 0x0 0x0 IRQ_INT_ALL>;
 		interrupt-map = <
 
 			/* IDSEL 0x02 */
-			0x1000 0x0 0x0 0x1 &mpic 0x1 0x1
-			0x1000 0x0 0x0 0x2 &mpic 0x2 0x1
-			0x1000 0x0 0x0 0x3 &mpic 0x3 0x1
-			0x1000 0x0 0x0 0x4 &mpic 0x4 0x1
+			0x1000 0x0 0x0 IRQ_INTA &mpic 0x1 0x1
+			0x1000 0x0 0x0 IRQ_INTB &mpic 0x2 0x1
+			0x1000 0x0 0x0 IRQ_INTC &mpic 0x3 0x1
+			0x1000 0x0 0x0 IRQ_INTD &mpic 0x4 0x1
 
 			/* IDSEL 0x03 */
-			0x1800 0x0 0x0 0x1 &mpic 0x4 0x1
-			0x1800 0x0 0x0 0x2 &mpic 0x1 0x1
-			0x1800 0x0 0x0 0x3 &mpic 0x2 0x1
-			0x1800 0x0 0x0 0x4 &mpic 0x3 0x1
+			0x1800 0x0 0x0 IRQ_INTA &mpic 0x4 0x1
+			0x1800 0x0 0x0 IRQ_INTB &mpic 0x1 0x1
+			0x1800 0x0 0x0 IRQ_INTC &mpic 0x2 0x1
+			0x1800 0x0 0x0 IRQ_INTD &mpic 0x3 0x1
 
 			/* IDSEL 0x04 */
-			0x2000 0x0 0x0 0x1 &mpic 0x3 0x1
-			0x2000 0x0 0x0 0x2 &mpic 0x4 0x1
-			0x2000 0x0 0x0 0x3 &mpic 0x1 0x1
-			0x2000 0x0 0x0 0x4 &mpic 0x2 0x1
+			0x2000 0x0 0x0 IRQ_INTA &mpic 0x3 0x1
+			0x2000 0x0 0x0 IRQ_INTB &mpic 0x4 0x1
+			0x2000 0x0 0x0 IRQ_INTC &mpic 0x1 0x1
+			0x2000 0x0 0x0 IRQ_INTD &mpic 0x2 0x1
 
 			/* IDSEL 0x05 */
-			0x2800 0x0 0x0 0x1 &mpic 0x2 0x1
-			0x2800 0x0 0x0 0x2 &mpic 0x3 0x1
-			0x2800 0x0 0x0 0x3 &mpic 0x4 0x1
-			0x2800 0x0 0x0 0x4 &mpic 0x1 0x1
+			0x2800 0x0 0x0 IRQ_INTA &mpic 0x2 0x1
+			0x2800 0x0 0x0 IRQ_INTB &mpic 0x3 0x1
+			0x2800 0x0 0x0 IRQ_INTC &mpic 0x4 0x1
+			0x2800 0x0 0x0 IRQ_INTD &mpic 0x1 0x1
 
 			/* IDSEL 0x0c */
-			0x6000 0x0 0x0 0x1 &mpic 0x1 0x1
-			0x6000 0x0 0x0 0x2 &mpic 0x2 0x1
-			0x6000 0x0 0x0 0x3 &mpic 0x3 0x1
-			0x6000 0x0 0x0 0x4 &mpic 0x4 0x1
+			0x6000 0x0 0x0 IRQ_INTA &mpic 0x1 0x1
+			0x6000 0x0 0x0 IRQ_INTB &mpic 0x2 0x1
+			0x6000 0x0 0x0 IRQ_INTC &mpic 0x3 0x1
+			0x6000 0x0 0x0 IRQ_INTD &mpic 0x4 0x1
 
 			/* IDSEL 0x0d */
-			0x6800 0x0 0x0 0x1 &mpic 0x4 0x1
-			0x6800 0x0 0x0 0x2 &mpic 0x1 0x1
-			0x6800 0x0 0x0 0x3 &mpic 0x2 0x1
-			0x6800 0x0 0x0 0x4 &mpic 0x3 0x1
+			0x6800 0x0 0x0 IRQ_INTA &mpic 0x4 0x1
+			0x6800 0x0 0x0 IRQ_INTB &mpic 0x1 0x1
+			0x6800 0x0 0x0 IRQ_INTC &mpic 0x2 0x1
+			0x6800 0x0 0x0 IRQ_INTD &mpic 0x3 0x1
 
 			/* IDSEL 0x0e */
-			0x7000 0x0 0x0 0x1 &mpic 0x3 0x1
-			0x7000 0x0 0x0 0x2 &mpic 0x4 0x1
-			0x7000 0x0 0x0 0x3 &mpic 0x1 0x1
-			0x7000 0x0 0x0 0x4 &mpic 0x2 0x1
+			0x7000 0x0 0x0 IRQ_INTA &mpic 0x3 0x1
+			0x7000 0x0 0x0 IRQ_INTB &mpic 0x4 0x1
+			0x7000 0x0 0x0 IRQ_INTC &mpic 0x1 0x1
+			0x7000 0x0 0x0 IRQ_INTD &mpic 0x2 0x1
 
 			/* IDSEL 0x0f */
-			0x7800 0x0 0x0 0x1 &mpic 0x2 0x1
-			0x7800 0x0 0x0 0x2 &mpic 0x3 0x1
-			0x7800 0x0 0x0 0x3 &mpic 0x4 0x1
-			0x7800 0x0 0x0 0x4 &mpic 0x1 0x1
+			0x7800 0x0 0x0 IRQ_INTA &mpic 0x2 0x1
+			0x7800 0x0 0x0 IRQ_INTB &mpic 0x3 0x1
+			0x7800 0x0 0x0 IRQ_INTC &mpic 0x4 0x1
+			0x7800 0x0 0x0 IRQ_INTD &mpic 0x1 0x1
 
 			/* IDSEL 0x12 */
-			0x9000 0x0 0x0 0x1 &mpic 0x1 0x1
-			0x9000 0x0 0x0 0x2 &mpic 0x2 0x1
-			0x9000 0x0 0x0 0x3 &mpic 0x3 0x1
-			0x9000 0x0 0x0 0x4 &mpic 0x4 0x1
+			0x9000 0x0 0x0 IRQ_INTA &mpic 0x1 0x1
+			0x9000 0x0 0x0 IRQ_INTB &mpic 0x2 0x1
+			0x9000 0x0 0x0 IRQ_INTC &mpic 0x3 0x1
+			0x9000 0x0 0x0 IRQ_INTD &mpic 0x4 0x1
 
 			/* IDSEL 0x13 */
-			0x9800 0x0 0x0 0x1 &mpic 0x4 0x1
-			0x9800 0x0 0x0 0x2 &mpic 0x1 0x1
-			0x9800 0x0 0x0 0x3 &mpic 0x2 0x1
-			0x9800 0x0 0x0 0x4 &mpic 0x3 0x1
+			0x9800 0x0 0x0 IRQ_INTA &mpic 0x4 0x1
+			0x9800 0x0 0x0 IRQ_INTB &mpic 0x1 0x1
+			0x9800 0x0 0x0 IRQ_INTC &mpic 0x2 0x1
+			0x9800 0x0 0x0 IRQ_INTD &mpic 0x3 0x1
 
 			/* IDSEL 0x14 */
-			0xa000 0x0 0x0 0x1 &mpic 0x3 0x1
-			0xa000 0x0 0x0 0x2 &mpic 0x4 0x1
-			0xa000 0x0 0x0 0x3 &mpic 0x1 0x1
-			0xa000 0x0 0x0 0x4 &mpic 0x2 0x1
+			0xa000 0x0 0x0 IRQ_INTA &mpic 0x3 0x1
+			0xa000 0x0 0x0 IRQ_INTB &mpic 0x4 0x1
+			0xa000 0x0 0x0 IRQ_INTC &mpic 0x1 0x1
+			0xa000 0x0 0x0 IRQ_INTD &mpic 0x2 0x1
 
 			/* IDSEL 0x15 */
-			0xa800 0x0 0x0 0x1 &mpic 0x2 0x1
-			0xa800 0x0 0x0 0x2 &mpic 0x3 0x1
-			0xa800 0x0 0x0 0x3 &mpic 0x4 0x1
-			0xa800 0x0 0x0 0x4 &mpic 0x1 0x1>;
+			0xa800 0x0 0x0 IRQ_INTA &mpic 0x2 0x1
+			0xa800 0x0 0x0 IRQ_INTB &mpic 0x3 0x1
+			0xa800 0x0 0x0 IRQ_INTC &mpic 0x4 0x1
+			0xa800 0x0 0x0 IRQ_INTD &mpic 0x1 0x1>;
 		interrupt-parent = <&mpic>;
 		interrupts = <24 2>;
 		bus-range = <0 0>;
diff --git a/arch/powerpc/boot/dts/fsl/mpc8544ds.dts b/arch/powerpc/boot/dts/fsl/mpc8544ds.dts
index f4a8b71396a5..b4a3f88ceb92 100644
--- a/arch/powerpc/boot/dts/fsl/mpc8544ds.dts
+++ b/arch/powerpc/boot/dts/fsl/mpc8544ds.dts
@@ -7,6 +7,8 @@ 
 
 /include/ "mpc8544si-pre.dtsi"
 
+#include <dt-bindings/interrupt-controller/irq.h>
+
 / {
 	model = "MPC8544DS";
 	compatible = "MPC8544DS", "MPC85xxDS";
@@ -31,21 +33,21 @@ 
 		ranges = <0x2000000 0x0 0xc0000000 0 0xc0000000 0x0 0x20000000
 			  0x1000000 0x0 0x00000000 0 0xe1000000 0x0 0x10000>;
 		clock-frequency = <66666666>;
-		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+		interrupt-map-mask = <0xf800 0x0 0x0 IRQ_INT_ALL>;
 		interrupt-map = <
 
 			/* IDSEL 0x11 J17 Slot 1 */
-			0x8800 0x0 0x0 0x1 &mpic 0x2 0x1 0 0
-			0x8800 0x0 0x0 0x2 &mpic 0x3 0x1 0 0
-			0x8800 0x0 0x0 0x3 &mpic 0x4 0x1 0 0
-			0x8800 0x0 0x0 0x4 &mpic 0x1 0x1 0 0
+			0x8800 0x0 0x0 IRQ_INTA &mpic 0x2 0x1 0 0
+			0x8800 0x0 0x0 IRQ_INTB &mpic 0x3 0x1 0 0
+			0x8800 0x0 0x0 IRQ_INTC &mpic 0x4 0x1 0 0
+			0x8800 0x0 0x0 IRQ_INTD &mpic 0x1 0x1 0 0
 
 			/* IDSEL 0x12 J16 Slot 2 */
 
-			0x9000 0x0 0x0 0x1 &mpic 0x3 0x1 0 0
-			0x9000 0x0 0x0 0x2 &mpic 0x4 0x1 0 0
-			0x9000 0x0 0x0 0x3 &mpic 0x2 0x1 0 0
-			0x9000 0x0 0x0 0x4 &mpic 0x1 0x1 0 0>;
+			0x9000 0x0 0x0 IRQ_INTA &mpic 0x3 0x1 0 0
+			0x9000 0x0 0x0 IRQ_INTB &mpic 0x4 0x1 0 0
+			0x9000 0x0 0x0 IRQ_INTC &mpic 0x2 0x1 0 0
+			0x9000 0x0 0x0 IRQ_INTD &mpic 0x1 0x1 0 0>;
 	};
 
 	pci1: pcie@e0009000 {
@@ -100,4 +102,4 @@ 
  */
 
 /include/ "mpc8544si-post.dtsi"
-/include/ "mpc8544ds.dtsi"
+#include "mpc8544ds.dtsi"
diff --git a/arch/powerpc/boot/dts/fsl/mpc8544ds.dtsi b/arch/powerpc/boot/dts/fsl/mpc8544ds.dtsi
index 47d986b041f6..7980e1f44838 100644
--- a/arch/powerpc/boot/dts/fsl/mpc8544ds.dtsi
+++ b/arch/powerpc/boot/dts/fsl/mpc8544ds.dtsi
@@ -32,6 +32,8 @@ 
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <dt-bindings/interrupt-controller/irq.h>
+
 &board_lbc {
 	nor@0,0 {
 		#address-cells = <1>;
@@ -119,24 +121,24 @@ 
 
 &board_pci3 {
 	pcie@0 {
-		interrupt-map-mask = <0xff00 0x0 0x0 0x7>;
+		interrupt-map-mask = <0xff00 0x0 0x0 IRQ_INT_ALL>;
 		interrupt-map = <
 			// IDSEL 0x1c  USB
-			0xe000 0x0 0x0 0x1 &i8259 0xc 0x2
-			0xe100 0x0 0x0 0x2 &i8259 0x9 0x2
-			0xe200 0x0 0x0 0x3 &i8259 0xa 0x2
-			0xe300 0x0 0x0 0x4 &i8259 0xb 0x2
+			0xe000 0x0 0x0 IRQ_INTA &i8259 0xc 0x2
+			0xe100 0x0 0x0 IRQ_INTB &i8259 0x9 0x2
+			0xe200 0x0 0x0 IRQ_INTC &i8259 0xa 0x2
+			0xe300 0x0 0x0 IRQ_INTD &i8259 0xb 0x2
 
 			// IDSEL 0x1d  Audio
-			0xe800 0x0 0x0 0x1 &i8259 0x6 0x2
+			0xe800 0x0 0x0 IRQ_INTA &i8259 0x6 0x2
 
 			// IDSEL 0x1e Legacy
-			0xf000 0x0 0x0 0x1 &i8259 0x7 0x2
-			0xf100 0x0 0x0 0x1 &i8259 0x7 0x2
+			0xf000 0x0 0x0 IRQ_INTA &i8259 0x7 0x2
+			0xf100 0x0 0x0 IRQ_INTA &i8259 0x7 0x2
 
 			// IDSEL 0x1f IDE/SATA
-			0xf800 0x0 0x0 0x1 &i8259 0xe 0x2
-			0xf900 0x0 0x0 0x1 &i8259 0x5 0x2
+			0xf800 0x0 0x0 IRQ_INTA &i8259 0xe 0x2
+			0xf900 0x0 0x0 IRQ_INTA &i8259 0x5 0x2
 			>;
 
 
diff --git a/arch/powerpc/boot/dts/fsl/mpc8548cds_32b.dts b/arch/powerpc/boot/dts/fsl/mpc8548cds_32b.dts
index f6ba4a982766..4b1a4e3a96e4 100644
--- a/arch/powerpc/boot/dts/fsl/mpc8548cds_32b.dts
+++ b/arch/powerpc/boot/dts/fsl/mpc8548cds_32b.dts
@@ -7,6 +7,8 @@ 
 
 /include/ "mpc8548si-pre.dtsi"
 
+#include <dt-bindings/interrupt-controller/irq.h>
+
 / {
 	model = "MPC8548CDS";
 	compatible = "MPC8548CDS", "MPC85xxCDS";
@@ -40,14 +42,14 @@ 
 		ranges = <0x2000000 0x0 0x90000000 0 0x90000000 0x0 0x10000000
 			  0x1000000 0x0 0x00000000 0 0xe2800000 0x0 0x800000>;
 		clock-frequency = <66666666>;
-		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+		interrupt-map-mask = <0xf800 0x0 0x0 IRQ_INT_ALL>;
 		interrupt-map = <
 
 			/* IDSEL 0x15 */
-			0xa800 0x0 0x0 0x1 &mpic 0xb 0x1 0 0
-			0xa800 0x0 0x0 0x2 &mpic 0x1 0x1 0 0
-			0xa800 0x0 0x0 0x3 &mpic 0x2 0x1 0 0
-			0xa800 0x0 0x0 0x4 &mpic 0x3 0x1 0 0>;
+			0xa800 0x0 0x0 IRQ_INTA &mpic 0xb 0x1 0 0
+			0xa800 0x0 0x0 IRQ_INTB &mpic 0x1 0x1 0 0
+			0xa800 0x0 0x0 IRQ_INTC &mpic 0x2 0x1 0 0
+			0xa800 0x0 0x0 IRQ_INTD &mpic 0x3 0x1 0 0>;
 	};
 
 	pci2: pcie@e000a000 {
@@ -78,5 +80,5 @@ 
  * for interrupt-map & interrupt-map-mask.
  */
 
-/include/ "mpc8548si-post.dtsi"
+#include "mpc8548si-post.dtsi"
 /include/ "mpc8548cds.dtsi"
diff --git a/arch/powerpc/boot/dts/fsl/mpc8548cds_36b.dts b/arch/powerpc/boot/dts/fsl/mpc8548cds_36b.dts
index 32e9076375ae..e2954eafaf85 100644
--- a/arch/powerpc/boot/dts/fsl/mpc8548cds_36b.dts
+++ b/arch/powerpc/boot/dts/fsl/mpc8548cds_36b.dts
@@ -7,6 +7,8 @@ 
 
 /include/ "mpc8548si-pre.dtsi"
 
+#include <dt-bindings/interrupt-controller/irq.h>
+
 / {
 	model = "MPC8548CDS";
 	compatible = "MPC8548CDS", "MPC85xxCDS";
@@ -40,14 +42,14 @@ 
 		ranges = <0x2000000 0x0 0xe0000000 0xc 0x10000000 0x0 0x10000000
 			  0x1000000 0x0 0x00000000 0xf 0xe2800000 0x0 0x800000>;
 		clock-frequency = <66666666>;
-		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+		interrupt-map-mask = <0xf800 0x0 0x0 IRQ_INT_ALL>;
 		interrupt-map = <
 
 			/* IDSEL 0x15 */
-			0xa800 0x0 0x0 0x1 &mpic 0xb 0x1 0 0
-			0xa800 0x0 0x0 0x2 &mpic 0x1 0x1 0 0
-			0xa800 0x0 0x0 0x3 &mpic 0x2 0x1 0 0
-			0xa800 0x0 0x0 0x4 &mpic 0x3 0x1 0 0>;
+			0xa800 0x0 0x0 IRQ_INTA &mpic 0xb 0x1 0 0
+			0xa800 0x0 0x0 IRQ_INTB &mpic 0x1 0x1 0 0
+			0xa800 0x0 0x0 IRQ_INTC &mpic 0x2 0x1 0 0
+			0xa800 0x0 0x0 IRQ_INTD &mpic 0x3 0x1 0 0>;
 	};
 
 	pci2: pcie@fe000a000 {
@@ -78,5 +80,5 @@ 
  * for interrupt-map & interrupt-map-mask.
  */
 
-/include/ "mpc8548si-post.dtsi"
+#include "mpc8548si-post.dtsi"
 /include/ "mpc8548cds.dtsi"
diff --git a/arch/powerpc/boot/dts/fsl/mpc8548si-post.dtsi b/arch/powerpc/boot/dts/fsl/mpc8548si-post.dtsi
index 579d76cb8e32..0bc8fe3c42c7 100644
--- a/arch/powerpc/boot/dts/fsl/mpc8548si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/mpc8548si-post.dtsi
@@ -32,6 +32,8 @@ 
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <dt-bindings/interrupt-controller/irq.h>
+
 &lbc {
 	#address-cells = <2>;
 	#size-cells = <1>;
@@ -78,13 +80,13 @@ 
 		#address-cells = <3>;
 		device_type = "pci";
 		interrupts = <26 2 0 0>;
-		interrupt-map-mask = <0xf800 0 0 7>;
+		interrupt-map-mask = <0xf800 0 0 IRQ_INT_ALL>;
 		interrupt-map = <
 			/* IDSEL 0x0 */
-			0000 0x0 0x0 0x1 &mpic 0x0 0x1 0x0 0x0
-			0000 0x0 0x0 0x2 &mpic 0x1 0x1 0x0 0x0
-			0000 0x0 0x0 0x3 &mpic 0x2 0x1 0x0 0x0
-			0000 0x0 0x0 0x4 &mpic 0x3 0x1 0x0 0x0
+			0000 0x0 0x0 IRQ_INTA &mpic 0x0 0x1 0x0 0x0
+			0000 0x0 0x0 IRQ_INTB &mpic 0x1 0x1 0x0 0x0
+			0000 0x0 0x0 IRQ_INTC &mpic 0x2 0x1 0x0 0x0
+			0000 0x0 0x0 IRQ_INTD &mpic 0x3 0x1 0x0 0x0
 			>;
 	};
 };
diff --git a/arch/powerpc/boot/dts/fsl/mpc8560ads.dts b/arch/powerpc/boot/dts/fsl/mpc8560ads.dts
index a24722ccaebf..5a38230cbaa9 100644
--- a/arch/powerpc/boot/dts/fsl/mpc8560ads.dts
+++ b/arch/powerpc/boot/dts/fsl/mpc8560ads.dts
@@ -9,6 +9,8 @@ 
 
 /include/ "e500v2_power_isa.dtsi"
 
+#include <dt-bindings/interrupt-controller/irq.h>
+
 / {
 	model = "MPC8560ADS";
 	compatible = "MPC8560ADS", "MPC85xxADS";
@@ -304,80 +306,80 @@ 
 		device_type = "pci";
 		reg = <0xe0008000 0x1000>;
 		clock-frequency = <66666666>;
-		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+		interrupt-map-mask = <0xf800 0x0 0x0 IRQ_INT_ALL>;
 		interrupt-map = <
 
 				/* IDSEL 0x2 */
-				 0x1000 0x0 0x0 0x1 &mpic 0x1 0x1
-				 0x1000 0x0 0x0 0x2 &mpic 0x2 0x1
-				 0x1000 0x0 0x0 0x3 &mpic 0x3 0x1
-				 0x1000 0x0 0x0 0x4 &mpic 0x4 0x1
+				 0x1000 0x0 0x0 IRQ_INTA &mpic 0x1 0x1
+				 0x1000 0x0 0x0 IRQ_INTB &mpic 0x2 0x1
+				 0x1000 0x0 0x0 IRQ_INTC &mpic 0x3 0x1
+				 0x1000 0x0 0x0 IRQ_INTD &mpic 0x4 0x1
 
 				/* IDSEL 0x3 */
-				 0x1800 0x0 0x0 0x1 &mpic 0x4 0x1
-				 0x1800 0x0 0x0 0x2 &mpic 0x1 0x1
-				 0x1800 0x0 0x0 0x3 &mpic 0x2 0x1
-				 0x1800 0x0 0x0 0x4 &mpic 0x3 0x1
+				 0x1800 0x0 0x0 IRQ_INTA &mpic 0x4 0x1
+				 0x1800 0x0 0x0 IRQ_INTB &mpic 0x1 0x1
+				 0x1800 0x0 0x0 IRQ_INTC &mpic 0x2 0x1
+				 0x1800 0x0 0x0 IRQ_INTD &mpic 0x3 0x1
 
 				/* IDSEL 0x4 */
-				 0x2000 0x0 0x0 0x1 &mpic 0x3 0x1
-				 0x2000 0x0 0x0 0x2 &mpic 0x4 0x1
-				 0x2000 0x0 0x0 0x3 &mpic 0x1 0x1
-				 0x2000 0x0 0x0 0x4 &mpic 0x2 0x1
+				 0x2000 0x0 0x0 IRQ_INTA &mpic 0x3 0x1
+				 0x2000 0x0 0x0 IRQ_INTB &mpic 0x4 0x1
+				 0x2000 0x0 0x0 IRQ_INTC &mpic 0x1 0x1
+				 0x2000 0x0 0x0 IRQ_INTD &mpic 0x2 0x1
 
 				/* IDSEL 0x5  */
-				 0x2800 0x0 0x0 0x1 &mpic 0x2 0x1
-				 0x2800 0x0 0x0 0x2 &mpic 0x3 0x1
-				 0x2800 0x0 0x0 0x3 &mpic 0x4 0x1
-				 0x2800 0x0 0x0 0x4 &mpic 0x1 0x1
+				 0x2800 0x0 0x0 IRQ_INTA &mpic 0x2 0x1
+				 0x2800 0x0 0x0 IRQ_INTB &mpic 0x3 0x1
+				 0x2800 0x0 0x0 IRQ_INTC &mpic 0x4 0x1
+				 0x2800 0x0 0x0 IRQ_INTD &mpic 0x1 0x1
 
 				/* IDSEL 12 */
-				 0x6000 0x0 0x0 0x1 &mpic 0x1 0x1
-				 0x6000 0x0 0x0 0x2 &mpic 0x2 0x1
-				 0x6000 0x0 0x0 0x3 &mpic 0x3 0x1
-				 0x6000 0x0 0x0 0x4 &mpic 0x4 0x1
+				 0x6000 0x0 0x0 IRQ_INTA &mpic 0x1 0x1
+				 0x6000 0x0 0x0 IRQ_INTB &mpic 0x2 0x1
+				 0x6000 0x0 0x0 IRQ_INTC &mpic 0x3 0x1
+				 0x6000 0x0 0x0 IRQ_INTD &mpic 0x4 0x1
 
 				/* IDSEL 13 */
-				 0x6800 0x0 0x0 0x1 &mpic 0x4 0x1
-				 0x6800 0x0 0x0 0x2 &mpic 0x1 0x1
-				 0x6800 0x0 0x0 0x3 &mpic 0x2 0x1
-				 0x6800 0x0 0x0 0x4 &mpic 0x3 0x1
+				 0x6800 0x0 0x0 IRQ_INTA &mpic 0x4 0x1
+				 0x6800 0x0 0x0 IRQ_INTB &mpic 0x1 0x1
+				 0x6800 0x0 0x0 IRQ_INTC &mpic 0x2 0x1
+				 0x6800 0x0 0x0 IRQ_INTD &mpic 0x3 0x1
 
 				/* IDSEL 14*/
-				 0x7000 0x0 0x0 0x1 &mpic 0x3 0x1
-				 0x7000 0x0 0x0 0x2 &mpic 0x4 0x1
-				 0x7000 0x0 0x0 0x3 &mpic 0x1 0x1
-				 0x7000 0x0 0x0 0x4 &mpic 0x2 0x1
+				 0x7000 0x0 0x0 IRQ_INTA &mpic 0x3 0x1
+				 0x7000 0x0 0x0 IRQ_INTB &mpic 0x4 0x1
+				 0x7000 0x0 0x0 IRQ_INTC &mpic 0x1 0x1
+				 0x7000 0x0 0x0 IRQ_INTD &mpic 0x2 0x1
 
 				/* IDSEL 15 */
-				 0x7800 0x0 0x0 0x1 &mpic 0x2 0x1
-				 0x7800 0x0 0x0 0x2 &mpic 0x3 0x1
-				 0x7800 0x0 0x0 0x3 &mpic 0x4 0x1
-				 0x7800 0x0 0x0 0x4 &mpic 0x1 0x1
+				 0x7800 0x0 0x0 IRQ_INTA &mpic 0x2 0x1
+				 0x7800 0x0 0x0 IRQ_INTB &mpic 0x3 0x1
+				 0x7800 0x0 0x0 IRQ_INTC &mpic 0x4 0x1
+				 0x7800 0x0 0x0 IRQ_INTD &mpic 0x1 0x1
 
 				/* IDSEL 18 */
-				 0x9000 0x0 0x0 0x1 &mpic 0x1 0x1
-				 0x9000 0x0 0x0 0x2 &mpic 0x2 0x1
-				 0x9000 0x0 0x0 0x3 &mpic 0x3 0x1
-				 0x9000 0x0 0x0 0x4 &mpic 0x4 0x1
+				 0x9000 0x0 0x0 IRQ_INTA &mpic 0x1 0x1
+				 0x9000 0x0 0x0 IRQ_INTB &mpic 0x2 0x1
+				 0x9000 0x0 0x0 IRQ_INTC &mpic 0x3 0x1
+				 0x9000 0x0 0x0 IRQ_INTD &mpic 0x4 0x1
 
 				/* IDSEL 19 */
-				 0x9800 0x0 0x0 0x1 &mpic 0x4 0x1
-				 0x9800 0x0 0x0 0x2 &mpic 0x1 0x1
-				 0x9800 0x0 0x0 0x3 &mpic 0x2 0x1
-				 0x9800 0x0 0x0 0x4 &mpic 0x3 0x1
+				 0x9800 0x0 0x0 IRQ_INTA &mpic 0x4 0x1
+				 0x9800 0x0 0x0 IRQ_INTB &mpic 0x1 0x1
+				 0x9800 0x0 0x0 IRQ_INTC &mpic 0x2 0x1
+				 0x9800 0x0 0x0 IRQ_INTD &mpic 0x3 0x1
 
 				/* IDSEL 20 */
-				 0xa000 0x0 0x0 0x1 &mpic 0x3 0x1
-				 0xa000 0x0 0x0 0x2 &mpic 0x4 0x1
-				 0xa000 0x0 0x0 0x3 &mpic 0x1 0x1
-				 0xa000 0x0 0x0 0x4 &mpic 0x2 0x1
+				 0xa000 0x0 0x0 IRQ_INTA &mpic 0x3 0x1
+				 0xa000 0x0 0x0 IRQ_INTB &mpic 0x4 0x1
+				 0xa000 0x0 0x0 IRQ_INTC &mpic 0x1 0x1
+				 0xa000 0x0 0x0 IRQ_INTD &mpic 0x2 0x1
 
 				/* IDSEL 21 */
-				 0xa800 0x0 0x0 0x1 &mpic 0x2 0x1
-				 0xa800 0x0 0x0 0x2 &mpic 0x3 0x1
-				 0xa800 0x0 0x0 0x3 &mpic 0x4 0x1
-				 0xa800 0x0 0x0 0x4 &mpic 0x1 0x1>;
+				 0xa800 0x0 0x0 IRQ_INTA &mpic 0x2 0x1
+				 0xa800 0x0 0x0 IRQ_INTB &mpic 0x3 0x1
+				 0xa800 0x0 0x0 IRQ_INTC &mpic 0x4 0x1
+				 0xa800 0x0 0x0 IRQ_INTD &mpic 0x1 0x1>;
 
 		interrupt-parent = <&mpic>;
 		interrupts = <24 2>;
diff --git a/arch/powerpc/boot/dts/fsl/mpc8568mds.dts b/arch/powerpc/boot/dts/fsl/mpc8568mds.dts
index 3603b5ae1230..f4ea45d54f93 100644
--- a/arch/powerpc/boot/dts/fsl/mpc8568mds.dts
+++ b/arch/powerpc/boot/dts/fsl/mpc8568mds.dts
@@ -7,6 +7,8 @@ 
 
 /include/ "mpc8568si-pre.dtsi"
 
+#include <dt-bindings/interrupt-controller/irq.h>
+
 / {
 	model = "MPC8568EMDS";
 	compatible = "MPC8568EMDS", "MPC85xxMDS";
@@ -252,19 +254,19 @@ 
 		ranges = <0x2000000 0x0 0x80000000 0x0 0x80000000 0x0 0x20000000
 			  0x1000000 0x0 0x00000000 0x0 0xe2000000 0x0 0x800000>;
 		clock-frequency = <66666666>;
-		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+		interrupt-map-mask = <0xf800 0x0 0x0 IRQ_INT_ALL>;
 		interrupt-map = <
 			/* IDSEL 0x12 AD18 */
-			0x9000 0x0 0x0 0x1 &mpic 0x5 0x1 0 0
-			0x9000 0x0 0x0 0x2 &mpic 0x6 0x1 0 0
-			0x9000 0x0 0x0 0x3 &mpic 0x7 0x1 0 0
-			0x9000 0x0 0x0 0x4 &mpic 0x4 0x1 0 0
+			0x9000 0x0 0x0 IRQ_INTA &mpic 0x5 0x1 0 0
+			0x9000 0x0 0x0 IRQ_INTB &mpic 0x6 0x1 0 0
+			0x9000 0x0 0x0 IRQ_INTC &mpic 0x7 0x1 0 0
+			0x9000 0x0 0x0 IRQ_INTD &mpic 0x4 0x1 0 0
 
 			/* IDSEL 0x13 AD19 */
-			0x9800 0x0 0x0 0x1 &mpic 0x6 0x1 0 0
-			0x9800 0x0 0x0 0x2 &mpic 0x7 0x1 0 0
-			0x9800 0x0 0x0 0x3 &mpic 0x4 0x1 0 0
-			0x9800 0x0 0x0 0x4 &mpic 0x5 0x1 0 0>;
+			0x9800 0x0 0x0 IRQ_INTA &mpic 0x6 0x1 0 0
+			0x9800 0x0 0x0 IRQ_INTB &mpic 0x7 0x1 0 0
+			0x9800 0x0 0x0 IRQ_INTC &mpic 0x4 0x1 0 0
+			0x9800 0x0 0x0 IRQ_INTD &mpic 0x5 0x1 0 0>;
 	};
 
 	/* PCI Express */
@@ -307,4 +309,4 @@ 
 	};
 };
 
-/include/ "mpc8568si-post.dtsi"
+#include "mpc8568si-post.dtsi"
diff --git a/arch/powerpc/boot/dts/fsl/mpc8568si-post.dtsi b/arch/powerpc/boot/dts/fsl/mpc8568si-post.dtsi
index 64e7075a9cd4..48b41a7e7c79 100644
--- a/arch/powerpc/boot/dts/fsl/mpc8568si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/mpc8568si-post.dtsi
@@ -32,6 +32,8 @@ 
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <dt-bindings/interrupt-controller/irq.h>
+
 &lbc {
 	#address-cells = <2>;
 	#size-cells = <1>;
@@ -70,13 +72,13 @@ 
 		#address-cells = <3>;
 		device_type = "pci";
 		interrupts = <26 2 0 0>;
-		interrupt-map-mask = <0xf800 0 0 7>;
+		interrupt-map-mask = <0xf800 0 0 IRQ_INT_ALL>;
 		interrupt-map = <
 			/* IDSEL 0x0 */
-			0000 0x0 0x0 0x1 &mpic 0x0 0x1 0x0 0x0
-			0000 0x0 0x0 0x2 &mpic 0x1 0x1 0x0 0x0
-			0000 0x0 0x0 0x3 &mpic 0x2 0x1 0x0 0x0
-			0000 0x0 0x0 0x4 &mpic 0x3 0x1 0x0 0x0
+			0000 0x0 0x0 IRQ_INTA &mpic 0x0 0x1 0x0 0x0
+			0000 0x0 0x0 IRQ_INTB &mpic 0x1 0x1 0x0 0x0
+			0000 0x0 0x0 IRQ_INTC &mpic 0x2 0x1 0x0 0x0
+			0000 0x0 0x0 IRQ_INTD &mpic 0x3 0x1 0x0 0x0
 			>;
 	};
 };
diff --git a/arch/powerpc/boot/dts/fsl/mpc8569mds.dts b/arch/powerpc/boot/dts/fsl/mpc8569mds.dts
index 206614ea2269..a44cfe45edc1 100644
--- a/arch/powerpc/boot/dts/fsl/mpc8569mds.dts
+++ b/arch/powerpc/boot/dts/fsl/mpc8569mds.dts
@@ -440,4 +440,4 @@ 
 	};
 };
 
-/include/ "mpc8569si-post.dtsi"
+#include "mpc8569si-post.dtsi"
diff --git a/arch/powerpc/boot/dts/fsl/mpc8569si-post.dtsi b/arch/powerpc/boot/dts/fsl/mpc8569si-post.dtsi
index 3e6346a4a183..51ccbf53adf4 100644
--- a/arch/powerpc/boot/dts/fsl/mpc8569si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/mpc8569si-post.dtsi
@@ -32,6 +32,8 @@ 
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <dt-bindings/interrupt-controller/irq.h>
+
 &lbc {
 	#address-cells = <2>;
 	#size-cells = <1>;
@@ -58,13 +60,13 @@ 
 		#address-cells = <3>;
 		device_type = "pci";
 		interrupts = <26 2 0 0>;
-		interrupt-map-mask = <0xf800 0 0 7>;
+		interrupt-map-mask = <0xf800 0 0 IRQ_INT_ALL>;
 		interrupt-map = <
 			/* IDSEL 0x0 */
-			0000 0x0 0x0 0x1 &mpic 0x0 0x1 0x0 0x0
-			0000 0x0 0x0 0x2 &mpic 0x1 0x1 0x0 0x0
-			0000 0x0 0x0 0x3 &mpic 0x2 0x1 0x0 0x0
-			0000 0x0 0x0 0x4 &mpic 0x3 0x1 0x0 0x0
+			0000 0x0 0x0 IRQ_INTA &mpic 0x0 0x1 0x0 0x0
+			0000 0x0 0x0 IRQ_INTB &mpic 0x1 0x1 0x0 0x0
+			0000 0x0 0x0 IRQ_INTC &mpic 0x2 0x1 0x0 0x0
+			0000 0x0 0x0 IRQ_INTD &mpic 0x3 0x1 0x0 0x0
 			>;
 	};
 };
diff --git a/arch/powerpc/boot/dts/fsl/mpc8641_hpcn.dts b/arch/powerpc/boot/dts/fsl/mpc8641_hpcn.dts
index f7a2430d6629..cf5d93abf3e3 100644
--- a/arch/powerpc/boot/dts/fsl/mpc8641_hpcn.dts
+++ b/arch/powerpc/boot/dts/fsl/mpc8641_hpcn.dts
@@ -7,6 +7,8 @@ 
 
 /include/ "mpc8641si-pre.dtsi"
 
+#include <dt-bindings/interrupt-controller/irq.h>
+
 / {
 	model = "MPC8641HPCN";
 	compatible = "fsl,mpc8641hpcn";
@@ -162,120 +164,120 @@ 
 		reg = <0xffe08000 0x1000>;
 		ranges = <0x02000000 0x0 0x80000000 0x80000000 0x0 0x20000000
 			  0x01000000 0x0 0x00000000 0xffc00000 0x0 0x00010000>;
-		interrupt-map-mask = <0xff00 0 0 7>;
+		interrupt-map-mask = <0xff00 0 0 IRQ_INT_ALL>;
 		interrupt-map = <
 			/* IDSEL 0x11 func 0 - PCI slot 1 */
-			0x8800 0 0 1 &mpic 2 1 0 0
-			0x8800 0 0 2 &mpic 3 1 0 0
-			0x8800 0 0 3 &mpic 4 1 0 0
-			0x8800 0 0 4 &mpic 1 1 0 0
+			0x8800 0 0 IRQ_INTA &mpic 2 1 0 0
+			0x8800 0 0 IRQ_INTB &mpic 3 1 0 0
+			0x8800 0 0 IRQ_INTC &mpic 4 1 0 0
+			0x8800 0 0 IRQ_INTD &mpic 1 1 0 0
 
 			/* IDSEL 0x11 func 1 - PCI slot 1 */
-			0x8900 0 0 1 &mpic 2 1 0 0
-			0x8900 0 0 2 &mpic 3 1 0 0
-			0x8900 0 0 3 &mpic 4 1 0 0
-			0x8900 0 0 4 &mpic 1 1 0 0
+			0x8900 0 0 IRQ_INTA &mpic 2 1 0 0
+			0x8900 0 0 IRQ_INTB &mpic 3 1 0 0
+			0x8900 0 0 IRQ_INTC &mpic 4 1 0 0
+			0x8900 0 0 IRQ_INTD &mpic 1 1 0 0
 
 			/* IDSEL 0x11 func 2 - PCI slot 1 */
-			0x8a00 0 0 1 &mpic 2 1 0 0
-			0x8a00 0 0 2 &mpic 3 1 0 0
-			0x8a00 0 0 3 &mpic 4 1 0 0
-			0x8a00 0 0 4 &mpic 1 1 0 0
+			0x8a00 0 0 IRQ_INTA &mpic 2 1 0 0
+			0x8a00 0 0 IRQ_INTB &mpic 3 1 0 0
+			0x8a00 0 0 IRQ_INTC &mpic 4 1 0 0
+			0x8a00 0 0 IRQ_INTD &mpic 1 1 0 0
 
 			/* IDSEL 0x11 func 3 - PCI slot 1 */
-			0x8b00 0 0 1 &mpic 2 1 0 0
-			0x8b00 0 0 2 &mpic 3 1 0 0
-			0x8b00 0 0 3 &mpic 4 1 0 0
-			0x8b00 0 0 4 &mpic 1 1 0 0
+			0x8b00 0 0 IRQ_INTA &mpic 2 1 0 0
+			0x8b00 0 0 IRQ_INTB &mpic 3 1 0 0
+			0x8b00 0 0 IRQ_INTC &mpic 4 1 0 0
+			0x8b00 0 0 IRQ_INTD &mpic 1 1 0 0
 
 			/* IDSEL 0x11 func 4 - PCI slot 1 */
-			0x8c00 0 0 1 &mpic 2 1 0 0
-			0x8c00 0 0 2 &mpic 3 1 0 0
-			0x8c00 0 0 3 &mpic 4 1 0 0
-			0x8c00 0 0 4 &mpic 1 1 0 0
+			0x8c00 0 0 IRQ_INTA &mpic 2 1 0 0
+			0x8c00 0 0 IRQ_INTB &mpic 3 1 0 0
+			0x8c00 0 0 IRQ_INTC &mpic 4 1 0 0
+			0x8c00 0 0 IRQ_INTD &mpic 1 1 0 0
 
 			/* IDSEL 0x11 func 5 - PCI slot 1 */
-			0x8d00 0 0 1 &mpic 2 1 0 0
-			0x8d00 0 0 2 &mpic 3 1 0 0
-			0x8d00 0 0 3 &mpic 4 1 0 0
-			0x8d00 0 0 4 &mpic 1 1 0 0
+			0x8d00 0 0 IRQ_INTA &mpic 2 1 0 0
+			0x8d00 0 0 IRQ_INTB &mpic 3 1 0 0
+			0x8d00 0 0 IRQ_INTC &mpic 4 1 0 0
+			0x8d00 0 0 IRQ_INTD &mpic 1 1 0 0
 
 			/* IDSEL 0x11 func 6 - PCI slot 1 */
-			0x8e00 0 0 1 &mpic 2 1 0 0
-			0x8e00 0 0 2 &mpic 3 1 0 0
-			0x8e00 0 0 3 &mpic 4 1 0 0
-			0x8e00 0 0 4 &mpic 1 1 0 0
+			0x8e00 0 0 IRQ_INTA &mpic 2 1 0 0
+			0x8e00 0 0 IRQ_INTB &mpic 3 1 0 0
+			0x8e00 0 0 IRQ_INTC &mpic 4 1 0 0
+			0x8e00 0 0 IRQ_INTD &mpic 1 1 0 0
 
 			/* IDSEL 0x11 func 7 - PCI slot 1 */
-			0x8f00 0 0 1 &mpic 2 1 0 0
-			0x8f00 0 0 2 &mpic 3 1 0 0
-			0x8f00 0 0 3 &mpic 4 1 0 0
-			0x8f00 0 0 4 &mpic 1 1 0 0
+			0x8f00 0 0 IRQ_INTA &mpic 2 1 0 0
+			0x8f00 0 0 IRQ_INTB &mpic 3 1 0 0
+			0x8f00 0 0 IRQ_INTC &mpic 4 1 0 0
+			0x8f00 0 0 IRQ_INTD &mpic 1 1 0 0
 
 			/* IDSEL 0x12 func 0 - PCI slot 2 */
-			0x9000 0 0 1 &mpic 3 1 0 0
-			0x9000 0 0 2 &mpic 4 1 0 0
-			0x9000 0 0 3 &mpic 1 1 0 0
-			0x9000 0 0 4 &mpic 2 1 0 0
+			0x9000 0 0 IRQ_INTA &mpic 3 1 0 0
+			0x9000 0 0 IRQ_INTB &mpic 4 1 0 0
+			0x9000 0 0 IRQ_INTC &mpic 1 1 0 0
+			0x9000 0 0 IRQ_INTD &mpic 2 1 0 0
 
 			/* IDSEL 0x12 func 1 - PCI slot 2 */
-			0x9100 0 0 1 &mpic 3 1 0 0
-			0x9100 0 0 2 &mpic 4 1 0 0
-			0x9100 0 0 3 &mpic 1 1 0 0
-			0x9100 0 0 4 &mpic 2 1 0 0
+			0x9100 0 0 IRQ_INTA &mpic 3 1 0 0
+			0x9100 0 0 IRQ_INTB &mpic 4 1 0 0
+			0x9100 0 0 IRQ_INTC &mpic 1 1 0 0
+			0x9100 0 0 IRQ_INTD &mpic 2 1 0 0
 
 			/* IDSEL 0x12 func 2 - PCI slot 2 */
-			0x9200 0 0 1 &mpic 3 1 0 0
-			0x9200 0 0 2 &mpic 4 1 0 0
-			0x9200 0 0 3 &mpic 1 1 0 0
-			0x9200 0 0 4 &mpic 2 1 0 0
+			0x9200 0 0 IRQ_INTA &mpic 3 1 0 0
+			0x9200 0 0 IRQ_INTB &mpic 4 1 0 0
+			0x9200 0 0 IRQ_INTC &mpic 1 1 0 0
+			0x9200 0 0 IRQ_INTD &mpic 2 1 0 0
 
 			/* IDSEL 0x12 func 3 - PCI slot 2 */
-			0x9300 0 0 1 &mpic 3 1 0 0
-			0x9300 0 0 2 &mpic 4 1 0 0
-			0x9300 0 0 3 &mpic 1 1 0 0
-			0x9300 0 0 4 &mpic 2 1 0 0
+			0x9300 0 0 IRQ_INTA &mpic 3 1 0 0
+			0x9300 0 0 IRQ_INTB &mpic 4 1 0 0
+			0x9300 0 0 IRQ_INTC &mpic 1 1 0 0
+			0x9300 0 0 IRQ_INTD &mpic 2 1 0 0
 
 			/* IDSEL 0x12 func 4 - PCI slot 2 */
-			0x9400 0 0 1 &mpic 3 1 0 0
-			0x9400 0 0 2 &mpic 4 1 0 0
-			0x9400 0 0 3 &mpic 1 1 0 0
-			0x9400 0 0 4 &mpic 2 1 0 0
+			0x9400 0 0 IRQ_INTA &mpic 3 1 0 0
+			0x9400 0 0 IRQ_INTB &mpic 4 1 0 0
+			0x9400 0 0 IRQ_INTC &mpic 1 1 0 0
+			0x9400 0 0 IRQ_INTD &mpic 2 1 0 0
 
 			/* IDSEL 0x12 func 5 - PCI slot 2 */
-			0x9500 0 0 1 &mpic 3 1 0 0
-			0x9500 0 0 2 &mpic 4 1 0 0
-			0x9500 0 0 3 &mpic 1 1 0 0
-			0x9500 0 0 4 &mpic 2 1 0 0
+			0x9500 0 0 IRQ_INTA &mpic 3 1 0 0
+			0x9500 0 0 IRQ_INTB &mpic 4 1 0 0
+			0x9500 0 0 IRQ_INTC &mpic 1 1 0 0
+			0x9500 0 0 IRQ_INTD &mpic 2 1 0 0
 
 			/* IDSEL 0x12 func 6 - PCI slot 2 */
-			0x9600 0 0 1 &mpic 3 1 0 0
-			0x9600 0 0 2 &mpic 4 1 0 0
-			0x9600 0 0 3 &mpic 1 1 0 0
-			0x9600 0 0 4 &mpic 2 1 0 0
+			0x9600 0 0 IRQ_INTA &mpic 3 1 0 0
+			0x9600 0 0 IRQ_INTB &mpic 4 1 0 0
+			0x9600 0 0 IRQ_INTC &mpic 1 1 0 0
+			0x9600 0 0 IRQ_INTD &mpic 2 1 0 0
 
 			/* IDSEL 0x12 func 7 - PCI slot 2 */
-			0x9700 0 0 1 &mpic 3 1 0 0
-			0x9700 0 0 2 &mpic 4 1 0 0
-			0x9700 0 0 3 &mpic 1 1 0 0
-			0x9700 0 0 4 &mpic 2 1 0 0
+			0x9700 0 0 IRQ_INTA &mpic 3 1 0 0
+			0x9700 0 0 IRQ_INTB &mpic 4 1 0 0
+			0x9700 0 0 IRQ_INTC &mpic 1 1 0 0
+			0x9700 0 0 IRQ_INTD &mpic 2 1 0 0
 
 			// IDSEL 0x1c  USB
-			0xe000 0 0 1 &i8259 12 2
-			0xe100 0 0 2 &i8259 9 2
-			0xe200 0 0 3 &i8259 10 2
-			0xe300 0 0 4 &i8259 11 2
+			0xe000 0 0 IRQ_INTA &i8259 12 2
+			0xe100 0 0 IRQ_INTB &i8259 9 2
+			0xe200 0 0 IRQ_INTC &i8259 10 2
+			0xe300 0 0 IRQ_INTD &i8259 11 2
 
 			// IDSEL 0x1d  Audio
-			0xe800 0 0 1 &i8259 6 2
+			0xe800 0 0 IRQ_INTA &i8259 6 2
 
 			// IDSEL 0x1e Legacy
-			0xf000 0 0 1 &i8259 7 2
-			0xf100 0 0 1 &i8259 7 2
+			0xf000 0 0 IRQ_INTA &i8259 7 2
+			0xf100 0 0 IRQ_INTA &i8259 7 2
 
 			// IDSEL 0x1f IDE/SATA
-			0xf800 0 0 1 &i8259 14 2
-			0xf900 0 0 1 &i8259 5 2
+			0xf800 0 0 IRQ_INTA &i8259 14 2
+			0xf900 0 0 IRQ_INTA &i8259 5 2
 			>;
 
 		pcie@0 {
diff --git a/arch/powerpc/boot/dts/fsl/mpc8641_hpcn_36b.dts b/arch/powerpc/boot/dts/fsl/mpc8641_hpcn_36b.dts
index 3f5f7a99b9ea..45dcd64477f9 100644
--- a/arch/powerpc/boot/dts/fsl/mpc8641_hpcn_36b.dts
+++ b/arch/powerpc/boot/dts/fsl/mpc8641_hpcn_36b.dts
@@ -7,6 +7,8 @@ 
 
 /include/ "mpc8641si-pre.dtsi"
 
+#include <dt-bindings/interrupt-controller/irq.h>
+
 / {
 	model = "MPC8641HPCN";
 	compatible = "fsl,mpc8641hpcn";
@@ -129,120 +131,120 @@ 
 		reg = <0x0f 0xffe08000 0x0 0x1000>;
 		ranges = <0x02000000 0x0 0xe0000000 0x0c 0x00000000 0x0 0x20000000
 			  0x01000000 0x0 0x00000000 0x0f 0xffc00000 0x0 0x00010000>;
-		interrupt-map-mask = <0xff00 0 0 7>;
+		interrupt-map-mask = <0xff00 0 0 IRQ_INT_ALL>;
 		interrupt-map = <
 			/* IDSEL 0x11 func 0 - PCI slot 1 */
-			0x8800 0 0 1 &mpic 2 1 0 0
-			0x8800 0 0 2 &mpic 3 1 0 0
-			0x8800 0 0 3 &mpic 4 1 0 0
-			0x8800 0 0 4 &mpic 1 1 0 0
+			0x8800 0 0 IRQ_INTA &mpic 2 1 0 0
+			0x8800 0 0 IRQ_INTB &mpic 3 1 0 0
+			0x8800 0 0 IRQ_INTC &mpic 4 1 0 0
+			0x8800 0 0 IRQ_INTD &mpic 1 1 0 0
 
 			/* IDSEL 0x11 func 1 - PCI slot 1 */
-			0x8900 0 0 1 &mpic 2 1 0 0
-			0x8900 0 0 2 &mpic 3 1 0 0
-			0x8900 0 0 3 &mpic 4 1 0 0
-			0x8900 0 0 4 &mpic 1 1 0 0
+			0x8900 0 0 IRQ_INTA &mpic 2 1 0 0
+			0x8900 0 0 IRQ_INTB &mpic 3 1 0 0
+			0x8900 0 0 IRQ_INTC &mpic 4 1 0 0
+			0x8900 0 0 IRQ_INTD &mpic 1 1 0 0
 
 			/* IDSEL 0x11 func 2 - PCI slot 1 */
-			0x8a00 0 0 1 &mpic 2 1 0 0
-			0x8a00 0 0 2 &mpic 3 1 0 0
-			0x8a00 0 0 3 &mpic 4 1 0 0
-			0x8a00 0 0 4 &mpic 1 1 0 0
+			0x8a00 0 0 IRQ_INTA &mpic 2 1 0 0
+			0x8a00 0 0 IRQ_INTB &mpic 3 1 0 0
+			0x8a00 0 0 IRQ_INTC &mpic 4 1 0 0
+			0x8a00 0 0 IRQ_INTD &mpic 1 1 0 0
 
 			/* IDSEL 0x11 func 3 - PCI slot 1 */
-			0x8b00 0 0 1 &mpic 2 1 0 0
-			0x8b00 0 0 2 &mpic 3 1 0 0
-			0x8b00 0 0 3 &mpic 4 1 0 0
-			0x8b00 0 0 4 &mpic 1 1 0 0
+			0x8b00 0 0 IRQ_INTA &mpic 2 1 0 0
+			0x8b00 0 0 IRQ_INTB &mpic 3 1 0 0
+			0x8b00 0 0 IRQ_INTC &mpic 4 1 0 0
+			0x8b00 0 0 IRQ_INTD &mpic 1 1 0 0
 
 			/* IDSEL 0x11 func 4 - PCI slot 1 */
-			0x8c00 0 0 1 &mpic 2 1 0 0
-			0x8c00 0 0 2 &mpic 3 1 0 0
-			0x8c00 0 0 3 &mpic 4 1 0 0
-			0x8c00 0 0 4 &mpic 1 1 0 0
+			0x8c00 0 0 IRQ_INTA &mpic 2 1 0 0
+			0x8c00 0 0 IRQ_INTB &mpic 3 1 0 0
+			0x8c00 0 0 IRQ_INTC &mpic 4 1 0 0
+			0x8c00 0 0 IRQ_INTD &mpic 1 1 0 0
 
 			/* IDSEL 0x11 func 5 - PCI slot 1 */
-			0x8d00 0 0 1 &mpic 2 1 0 0
-			0x8d00 0 0 2 &mpic 3 1 0 0
-			0x8d00 0 0 3 &mpic 4 1 0 0
-			0x8d00 0 0 4 &mpic 1 1 0 0
+			0x8d00 0 0 IRQ_INTA &mpic 2 1 0 0
+			0x8d00 0 0 IRQ_INTB &mpic 3 1 0 0
+			0x8d00 0 0 IRQ_INTC &mpic 4 1 0 0
+			0x8d00 0 0 IRQ_INTD &mpic 1 1 0 0
 
 			/* IDSEL 0x11 func 6 - PCI slot 1 */
-			0x8e00 0 0 1 &mpic 2 1 0 0
-			0x8e00 0 0 2 &mpic 3 1 0 0
-			0x8e00 0 0 3 &mpic 4 1 0 0
-			0x8e00 0 0 4 &mpic 1 1 0 0
+			0x8e00 0 0 IRQ_INTA &mpic 2 1 0 0
+			0x8e00 0 0 IRQ_INTB &mpic 3 1 0 0
+			0x8e00 0 0 IRQ_INTC &mpic 4 1 0 0
+			0x8e00 0 0 IRQ_INTD &mpic 1 1 0 0
 
 			/* IDSEL 0x11 func 7 - PCI slot 1 */
-			0x8f00 0 0 1 &mpic 2 1 0 0
-			0x8f00 0 0 2 &mpic 3 1 0 0
-			0x8f00 0 0 3 &mpic 4 1 0 0
-			0x8f00 0 0 4 &mpic 1 1 0 0
+			0x8f00 0 0 IRQ_INTA &mpic 2 1 0 0
+			0x8f00 0 0 IRQ_INTB &mpic 3 1 0 0
+			0x8f00 0 0 IRQ_INTC &mpic 4 1 0 0
+			0x8f00 0 0 IRQ_INTD &mpic 1 1 0 0
 
 			/* IDSEL 0x12 func 0 - PCI slot 2 */
-			0x9000 0 0 1 &mpic 3 1 0 0
-			0x9000 0 0 2 &mpic 4 1 0 0
-			0x9000 0 0 3 &mpic 1 1 0 0
-			0x9000 0 0 4 &mpic 2 1 0 0
+			0x9000 0 0 IRQ_INTA &mpic 3 1 0 0
+			0x9000 0 0 IRQ_INTB &mpic 4 1 0 0
+			0x9000 0 0 IRQ_INTC &mpic 1 1 0 0
+			0x9000 0 0 IRQ_INTD &mpic 2 1 0 0
 
 			/* IDSEL 0x12 func 1 - PCI slot 2 */
-			0x9100 0 0 1 &mpic 3 1 0 0
-			0x9100 0 0 2 &mpic 4 1 0 0
-			0x9100 0 0 3 &mpic 1 1 0 0
-			0x9100 0 0 4 &mpic 2 1 0 0
+			0x9100 0 0 IRQ_INTA &mpic 3 1 0 0
+			0x9100 0 0 IRQ_INTB &mpic 4 1 0 0
+			0x9100 0 0 IRQ_INTC &mpic 1 1 0 0
+			0x9100 0 0 IRQ_INTD &mpic 2 1 0 0
 
 			/* IDSEL 0x12 func 2 - PCI slot 2 */
-			0x9200 0 0 1 &mpic 3 1 0 0
-			0x9200 0 0 2 &mpic 4 1 0 0
-			0x9200 0 0 3 &mpic 1 1 0 0
-			0x9200 0 0 4 &mpic 2 1 0 0
+			0x9200 0 0 IRQ_INTA &mpic 3 1 0 0
+			0x9200 0 0 IRQ_INTB &mpic 4 1 0 0
+			0x9200 0 0 IRQ_INTC &mpic 1 1 0 0
+			0x9200 0 0 IRQ_INTD &mpic 2 1 0 0
 
 			/* IDSEL 0x12 func 3 - PCI slot 2 */
-			0x9300 0 0 1 &mpic 3 1 0 0
-			0x9300 0 0 2 &mpic 4 1 0 0
-			0x9300 0 0 3 &mpic 1 1 0 0
-			0x9300 0 0 4 &mpic 2 1 0 0
+			0x9300 0 0 IRQ_INTA &mpic 3 1 0 0
+			0x9300 0 0 IRQ_INTB &mpic 4 1 0 0
+			0x9300 0 0 IRQ_INTC &mpic 1 1 0 0
+			0x9300 0 0 IRQ_INTD &mpic 2 1 0 0
 
 			/* IDSEL 0x12 func 4 - PCI slot 2 */
-			0x9400 0 0 1 &mpic 3 1 0 0
-			0x9400 0 0 2 &mpic 4 1 0 0
-			0x9400 0 0 3 &mpic 1 1 0 0
-			0x9400 0 0 4 &mpic 2 1 0 0
+			0x9400 0 0 IRQ_INTA &mpic 3 1 0 0
+			0x9400 0 0 IRQ_INTB &mpic 4 1 0 0
+			0x9400 0 0 IRQ_INTC &mpic 1 1 0 0
+			0x9400 0 0 IRQ_INTD &mpic 2 1 0 0
 
 			/* IDSEL 0x12 func 5 - PCI slot 2 */
-			0x9500 0 0 1 &mpic 3 1 0 0
-			0x9500 0 0 2 &mpic 4 1 0 0
-			0x9500 0 0 3 &mpic 1 1 0 0
-			0x9500 0 0 4 &mpic 2 1 0 0
+			0x9500 0 0 IRQ_INTA &mpic 3 1 0 0
+			0x9500 0 0 IRQ_INTB &mpic 4 1 0 0
+			0x9500 0 0 IRQ_INTC &mpic 1 1 0 0
+			0x9500 0 0 IRQ_INTD &mpic 2 1 0 0
 
 			/* IDSEL 0x12 func 6 - PCI slot 2 */
-			0x9600 0 0 1 &mpic 3 1 0 0
-			0x9600 0 0 2 &mpic 4 1 0 0
-			0x9600 0 0 3 &mpic 1 1 0 0
-			0x9600 0 0 4 &mpic 2 1 0 0
+			0x9600 0 0 IRQ_INTA &mpic 3 1 0 0
+			0x9600 0 0 IRQ_INTB &mpic 4 1 0 0
+			0x9600 0 0 IRQ_INTC &mpic 1 1 0 0
+			0x9600 0 0 IRQ_INTD &mpic 2 1 0 0
 
 			/* IDSEL 0x12 func 7 - PCI slot 2 */
-			0x9700 0 0 1 &mpic 3 1 0 0
-			0x9700 0 0 2 &mpic 4 1 0 0
-			0x9700 0 0 3 &mpic 1 1 0 0
-			0x9700 0 0 4 &mpic 2 1 0 0
+			0x9700 0 0 IRQ_INTA &mpic 3 1 0 0
+			0x9700 0 0 IRQ_INTB &mpic 4 1 0 0
+			0x9700 0 0 IRQ_INTC &mpic 1 1 0 0
+			0x9700 0 0 IRQ_INTD &mpic 2 1 0 0
 
 			// IDSEL 0x1c  USB
-			0xe000 0 0 1 &i8259 12 2
-			0xe100 0 0 2 &i8259 9 2
-			0xe200 0 0 3 &i8259 10 2
-			0xe300 0 0 4 &i8259 11 2
+			0xe000 0 0 IRQ_INTA &i8259 12 2
+			0xe100 0 0 IRQ_INTB &i8259 9 2
+			0xe200 0 0 IRQ_INTC &i8259 10 2
+			0xe300 0 0 IRQ_INTD &i8259 11 2
 
 			// IDSEL 0x1d  Audio
-			0xe800 0 0 1 &i8259 6 2
+			0xe800 0 0 IRQ_INTA &i8259 6 2
 
 			// IDSEL 0x1e Legacy
-			0xf000 0 0 1 &i8259 7 2
-			0xf100 0 0 1 &i8259 7 2
+			0xf000 0 0 IRQ_INTA &i8259 7 2
+			0xf100 0 0 IRQ_INTA &i8259 7 2
 
 			// IDSEL 0x1f IDE/SATA
-			0xf800 0 0 1 &i8259 14 2
-			0xf900 0 0 1 &i8259 5 2
+			0xf800 0 0 IRQ_INTA &i8259 14 2
+			0xf900 0 0 IRQ_INTA &i8259 5 2
 			>;
 
 		pcie@0 {
diff --git a/arch/powerpc/boot/dts/fsl/p2020ds.dts b/arch/powerpc/boot/dts/fsl/p2020ds.dts
index ae380ebe55cf..febf05c37eab 100644
--- a/arch/powerpc/boot/dts/fsl/p2020ds.dts
+++ b/arch/powerpc/boot/dts/fsl/p2020ds.dts
@@ -82,4 +82,4 @@ 
  */
 
 /include/ "p2020si-post.dtsi"
-/include/ "p2020ds.dtsi"
+#include "p2020ds.dtsi"
diff --git a/arch/powerpc/boot/dts/fsl/p2020ds.dtsi b/arch/powerpc/boot/dts/fsl/p2020ds.dtsi
index e699cf95b063..e036003daaf5 100644
--- a/arch/powerpc/boot/dts/fsl/p2020ds.dtsi
+++ b/arch/powerpc/boot/dts/fsl/p2020ds.dtsi
@@ -32,6 +32,8 @@ 
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <dt-bindings/interrupt-controller/irq.h>
+
 &board_lbc {
 	nor@0,0 {
 		#address-cells = <1>;
@@ -213,51 +215,51 @@ 
 
 &board_pci1 {
 	pcie@0 {
-		interrupt-map-mask = <0xff00 0x0 0x0 0x7>;
+		interrupt-map-mask = <0xff00 0x0 0x0 IRQ_INT_ALL>;
 		interrupt-map = <
 
 			// IDSEL 0x11 func 0 - PCI slot 1
-			0x8800 0x0 0x0 0x1 &i8259 0x9 0x2
-			0x8800 0x0 0x0 0x2 &i8259 0xa 0x2
+			0x8800 0x0 0x0 IRQ_INTA &i8259 0x9 0x2
+			0x8800 0x0 0x0 IRQ_INTB &i8259 0xa 0x2
 
 			// IDSEL 0x11 func 1 - PCI slot 1
-			0x8900 0x0 0x0 0x1 &i8259 0x9 0x2
-			0x8900 0x0 0x0 0x2 &i8259 0xa 0x2
+			0x8900 0x0 0x0 IRQ_INTA &i8259 0x9 0x2
+			0x8900 0x0 0x0 IRQ_INTB &i8259 0xa 0x2
 
 			// IDSEL 0x11 func 2 - PCI slot 1
-			0x8a00 0x0 0x0 0x1 &i8259 0x9 0x2
-			0x8a00 0x0 0x0 0x2 &i8259 0xa 0x2
+			0x8a00 0x0 0x0 IRQ_INTA &i8259 0x9 0x2
+			0x8a00 0x0 0x0 IRQ_INTB &i8259 0xa 0x2
 
 			// IDSEL 0x11 func 3 - PCI slot 1
-			0x8b00 0x0 0x0 0x1 &i8259 0x9 0x2
-			0x8b00 0x0 0x0 0x2 &i8259 0xa 0x2
+			0x8b00 0x0 0x0 IRQ_INTA &i8259 0x9 0x2
+			0x8b00 0x0 0x0 IRQ_INTB &i8259 0xa 0x2
 
 			// IDSEL 0x11 func 4 - PCI slot 1
-			0x8c00 0x0 0x0 0x1 &i8259 0x9 0x2
-			0x8c00 0x0 0x0 0x2 &i8259 0xa 0x2
+			0x8c00 0x0 0x0 IRQ_INTA &i8259 0x9 0x2
+			0x8c00 0x0 0x0 IRQ_INTB &i8259 0xa 0x2
 
 			// IDSEL 0x11 func 5 - PCI slot 1
-			0x8d00 0x0 0x0 0x1 &i8259 0x9 0x2
-			0x8d00 0x0 0x0 0x2 &i8259 0xa 0x2
+			0x8d00 0x0 0x0 IRQ_INTA &i8259 0x9 0x2
+			0x8d00 0x0 0x0 IRQ_INTB &i8259 0xa 0x2
 
 			// IDSEL 0x11 func 6 - PCI slot 1
-			0x8e00 0x0 0x0 0x1 &i8259 0x9 0x2
-			0x8e00 0x0 0x0 0x2 &i8259 0xa 0x2
+			0x8e00 0x0 0x0 IRQ_INTA &i8259 0x9 0x2
+			0x8e00 0x0 0x0 IRQ_INTB &i8259 0xa 0x2
 
 			// IDSEL 0x11 func 7 - PCI slot 1
-			0x8f00 0x0 0x0 0x1 &i8259 0x9 0x2
-			0x8f00 0x0 0x0 0x2 &i8259 0xa 0x2
+			0x8f00 0x0 0x0 IRQ_INTA &i8259 0x9 0x2
+			0x8f00 0x0 0x0 IRQ_INTB &i8259 0xa 0x2
 
 			// IDSEL 0x1d  Audio
-			0xe800 0x0 0x0 0x1 &i8259 0x6 0x2
+			0xe800 0x0 0x0 IRQ_INTA &i8259 0x6 0x2
 
 			// IDSEL 0x1e Legacy
-			0xf000 0x0 0x0 0x1 &i8259 0x7 0x2
-			0xf100 0x0 0x0 0x1 &i8259 0x7 0x2
+			0xf000 0x0 0x0 IRQ_INTA &i8259 0x7 0x2
+			0xf100 0x0 0x0 IRQ_INTA &i8259 0x7 0x2
 
 			// IDSEL 0x1f IDE/SATA
-			0xf800 0x0 0x0 0x1 &i8259 0xe 0x2
-			0xf900 0x0 0x0 0x1 &i8259 0x5 0x2
+			0xf800 0x0 0x0 IRQ_INTA &i8259 0xe 0x2
+			0xf900 0x0 0x0 IRQ_INTA &i8259 0x5 0x2
 			>;
 
 		uli1575@0 {
diff --git a/arch/powerpc/boot/dts/fsl/ppa8548.dts b/arch/powerpc/boot/dts/fsl/ppa8548.dts
index f39838d93994..df5c20ca1960 100644
--- a/arch/powerpc/boot/dts/fsl/ppa8548.dts
+++ b/arch/powerpc/boot/dts/fsl/ppa8548.dts
@@ -157,4 +157,4 @@ 
 	};
 };
 
-/include/ "mpc8548si-post.dtsi"
+#include "mpc8548si-post.dtsi"
diff --git a/arch/powerpc/boot/dts/fsl/sbc8641d.dts b/arch/powerpc/boot/dts/fsl/sbc8641d.dts
index 3dca10acc161..4089ff8134db 100644
--- a/arch/powerpc/boot/dts/fsl/sbc8641d.dts
+++ b/arch/powerpc/boot/dts/fsl/sbc8641d.dts
@@ -11,6 +11,8 @@ 
 
 /include/ "mpc8641si-pre.dtsi"
 
+#include <dt-bindings/interrupt-controller/irq.h>
+
 / {
 	model = "SBC8641D";
 	compatible = "wind,sbc8641";
@@ -142,7 +144,7 @@ 
 		reg = <0xf8008000 0x1000>;
 		ranges = <0x02000000 0x0 0x80000000 0x80000000 0x0 0x20000000
 			  0x01000000 0x0 0x00000000 0xe2000000 0x0 0x00100000>;
-		interrupt-map-mask = <0xff00 0 0 7>;
+		interrupt-map-mask = <0xff00 0 0 IRQ_INT_ALL>;
 
 		pcie@0 {
 			ranges = <0x02000000 0x0 0x80000000