* [PATCH v1 0/7] PCI: dt: Remove magic numbers for legacy PCI IRQ interrupts
@ 2019-11-04 16:38 Andrew Murray
2019-11-04 16:38 ` [PATCH v1 5/7] powerpc: dts: fsl: Use IRQ flags " Andrew Murray
2019-11-04 16:38 ` [PATCH v1 6/7] powerpc: dts: " Andrew Murray
0 siblings, 2 replies; 5+ messages in thread
From: Andrew Murray @ 2019-11-04 16:38 UTC (permalink / raw)
To: devicetree, linux-arm-kernel, linux-arm-kernel, linux-arm-msm,
linux-mediatek, linux-omap, linux-pci, linuxppc-dev,
linux-rockchip, linux-xtensa, rfi
PCI devices can trigger interrupts via 4 physical/virtual lines known
as INTA, INTB, INTC or INTD. Due to interrupt swizzling it is often
required to describe the interrupt mapping in the device tree. Let's
avoid the existing magic numbers and replace them with a #define to
improve clarity.
Based on v5.4-rc5, compile tested
Signed-off-by: Andrew Murray <andrew.murray@arm.com>
Andrew Murray (7):
PCI: dt: Add legacy PCI IRQ defines
arm64: dts: Use IRQ flags for legacy PCI IRQ interrupts
arm: dts: Use IRQ flags for legacy PCI IRQ interrupts
xtensa: dts: Use IRQ flags for legacy PCI IRQ interrupts
powerpc: dts: fsl: Use IRQ flags for legacy PCI IRQ interrupts
powerpc: dts: Use IRQ flags for legacy PCI IRQ interrupts
dt-bindings: PCI: Use IRQ flags for legacy PCI IRQ interrupts
.../devicetree/bindings/pci/83xx-512x-pci.txt | 18 +--
.../devicetree/bindings/pci/aardvark-pci.txt | 10 +-
.../devicetree/bindings/pci/altera-pcie.txt | 10 +-
.../bindings/pci/axis,artpec6-pcie.txt | 10 +-
.../bindings/pci/cdns,cdns-pcie-host.txt | 10 +-
.../bindings/pci/faraday,ftpci100.txt | 68 ++++----
.../bindings/pci/fsl,imx6q-pcie.txt | 10 +-
.../bindings/pci/hisilicon-pcie.txt | 20 +--
.../bindings/pci/host-generic-pci.txt | 10 +-
.../devicetree/bindings/pci/kirin-pcie.txt | 10 +-
.../bindings/pci/layerscape-pci.txt | 10 +-
.../devicetree/bindings/pci/mediatek-pcie.txt | 40 ++---
.../devicetree/bindings/pci/mobiveil-pcie.txt | 8 +-
.../devicetree/bindings/pci/pci-rcar-gen2.txt | 8 +-
.../bindings/pci/pci-thunder-pem.txt | 10 +-
.../devicetree/bindings/pci/pcie-al.txt | 4 +-
.../devicetree/bindings/pci/qcom,pcie.txt | 20 +--
.../bindings/pci/ralink,rt3883-pci.txt | 18 +--
.../bindings/pci/rockchip-pcie-host.txt | 10 +-
.../devicetree/bindings/pci/ti-pci.txt | 10 +-
.../devicetree/bindings/pci/uniphier-pcie.txt | 10 +-
.../bindings/pci/v3-v360epc-pci.txt | 34 ++--
.../devicetree/bindings/pci/versatile.txt | 40 ++---
.../devicetree/bindings/pci/xgene-pci-msi.txt | 10 +-
.../devicetree/bindings/pci/xgene-pci.txt | 10 +-
.../bindings/pci/xilinx-nwl-pcie.txt | 10 +-
.../devicetree/bindings/pci/xilinx-pcie.txt | 20 +--
arch/arm/boot/dts/alpine.dtsi | 6 +-
arch/arm/boot/dts/artpec6.dtsi | 10 +-
arch/arm/boot/dts/gemini-dlink-dir-685.dts | 34 ++--
arch/arm/boot/dts/gemini-sl93512r.dts | 34 ++--
arch/arm/boot/dts/gemini-sq201.dts | 34 ++--
arch/arm/boot/dts/gemini-wbd111.dts | 34 ++--
arch/arm/boot/dts/gemini-wbd222.dts | 34 ++--
arch/arm/boot/dts/imx6qdl.dtsi | 10 +-
arch/arm/boot/dts/imx6sx.dtsi | 10 +-
arch/arm/boot/dts/integratorap.dts | 36 +++--
arch/arm/boot/dts/keystone-k2e.dtsi | 11 +-
arch/arm/boot/dts/keystone.dtsi | 10 +-
arch/arm/boot/dts/qcom-apq8064.dtsi | 10 +-
arch/arm/boot/dts/qcom-ipq4019.dtsi | 10 +-
arch/arm/boot/dts/versatile-pb.dts | 36 +++--
arch/arm64/boot/dts/al/alpine-v2.dtsi | 6 +-
.../boot/dts/amd/amd-overdrive-rev-b0.dts | 2 +-
.../boot/dts/amd/amd-overdrive-rev-b1.dts | 2 +-
arch/arm64/boot/dts/amd/amd-overdrive.dts | 2 +-
arch/arm64/boot/dts/amd/amd-seattle-soc.dtsi | 12 +-
arch/arm64/boot/dts/amd/husky.dts | 2 +-
arch/arm64/boot/dts/arm/fvp-base-revc.dts | 10 +-
arch/arm64/boot/dts/arm/juno-base.dtsi | 12 +-
arch/arm64/boot/dts/cavium/thunder2-99xx.dtsi | 10 +-
.../arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 10 +-
arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 10 +-
arch/arm64/boot/dts/hisilicon/hip06.dtsi | 10 +-
arch/arm64/boot/dts/qcom/msm8998.dtsi | 10 +-
arch/arm64/boot/dts/qcom/qcs404.dtsi | 10 +-
arch/arm64/boot/dts/rockchip/rk3399.dtsi | 10 +-
.../boot/dts/socionext/uniphier-ld20.dtsi | 11 +-
.../boot/dts/socionext/uniphier-pxs3.dtsi | 11 +-
arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 12 +-
arch/powerpc/boot/dts/bluestone.dts | 12 +-
arch/powerpc/boot/dts/charon.dts | 12 +-
arch/powerpc/boot/dts/digsy_mtc.dts | 12 +-
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 +-
arch/powerpc/boot/dts/haleakala.dts | 12 +-
arch/powerpc/boot/dts/holly.dts | 42 ++---
arch/powerpc/boot/dts/hotfoot.dts | 12 +-
arch/powerpc/boot/dts/kuroboxHD.dts | 28 ++--
arch/powerpc/boot/dts/kuroboxHG.dts | 28 ++--
arch/powerpc/boot/dts/lite5200.dts | 12 +-
arch/powerpc/boot/dts/lite5200b.dts | 22 +--
arch/powerpc/boot/dts/media5200.dts | 26 +--
arch/powerpc/boot/dts/mpc5121ads.dts | 20 +--
arch/powerpc/boot/dts/mpc8308rdb.dts | 12 +-
arch/powerpc/boot/dts/mpc8313erdb.dts | 20 +--
arch/powerpc/boot/dts/mpc832x_mds.dts | 60 +++----
arch/powerpc/boot/dts/mpc832x_rdb.dts | 22 +--
arch/powerpc/boot/dts/mpc8349emitxgp.dts | 8 +-
arch/powerpc/boot/dts/mpc836x_mds.dts | 60 +++----
arch/powerpc/boot/dts/mpc836x_rdk.dts | 16 +-
arch/powerpc/boot/dts/mucmc52.dts | 12 +-
arch/powerpc/boot/dts/mvme5100.dts | 48 +++---
arch/powerpc/boot/dts/pcm030.dts | 22 +--
arch/powerpc/boot/dts/pcm032.dts | 22 +--
arch/powerpc/boot/dts/pq2fads.dts | 28 ++--
arch/powerpc/boot/dts/socrates.dts | 8 +-
arch/powerpc/boot/dts/storcenter.dts | 28 ++--
arch/powerpc/boot/dts/stx_gp3_8560.dts | 36 +++--
arch/powerpc/boot/dts/taishan.dts | 20 +--
arch/powerpc/boot/dts/tqm5200.dts | 12 +-
arch/powerpc/boot/dts/tqm8540.dts | 16 +-
arch/powerpc/boot/dts/tqm8541.dts | 16 +-
arch/powerpc/boot/dts/tqm8555.dts | 16 +-
arch/powerpc/boot/dts/tqm8560.dts | 16 +-
arch/powerpc/boot/dts/virtex440-ml510.dts | 43 ++---
arch/powerpc/boot/dts/xcalibur1501.dts | 13 +-
arch/powerpc/boot/dts/xpedite5200.dts | 8 +-
arch/xtensa/boot/dts/virt.dts | 12 +-
.../dt-bindings/interrupt-controller/irq.h | 8 +
128 files changed, 1326 insertions(+), 1189 deletions(-)
--
2.21.0
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v1 5/7] powerpc: dts: fsl: Use IRQ flags for legacy PCI IRQ interrupts
2019-11-04 16:38 [PATCH v1 0/7] PCI: dt: Remove magic numbers for legacy PCI IRQ interrupts Andrew Murray
@ 2019-11-04 16:38 ` Andrew Murray
2019-11-12 12:48 ` Michael Ellerman
2019-11-04 16:38 ` [PATCH v1 6/7] powerpc: dts: " Andrew Murray
1 sibling, 1 reply; 5+ messages in thread
From: Andrew Murray @ 2019-11-04 16:38 UTC (permalink / raw)
To: Rob Herring, Mark Rutland, Benjamin Herrenschmidt,
Paul Mackerras, Michael Ellerman
Cc: devicetree, linuxppc-dev
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(-)
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
--
2.21.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v1 6/7] powerpc: dts: Use IRQ flags for legacy PCI IRQ interrupts
2019-11-04 16:38 [PATCH v1 0/7] PCI: dt: Remove magic numbers for legacy PCI IRQ interrupts Andrew Murray
2019-11-04 16:38 ` [PATCH v1 5/7] powerpc: dts: fsl: Use IRQ flags " Andrew Murray
@ 2019-11-04 16:38 ` Andrew Murray
2019-11-12 12:48 ` Michael Ellerman
1 sibling, 1 reply; 5+ messages in thread
From: Andrew Murray @ 2019-11-04 16:38 UTC (permalink / raw)
To: Rob Herring, Mark Rutland, Benjamin Herrenschmidt,
Paul Mackerras, Michael Ellerman
Cc: devicetree, linuxppc-dev
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/bluestone.dts | 12 +++--
arch/powerpc/boot/dts/charon.dts | 12 +++--
arch/powerpc/boot/dts/digsy_mtc.dts | 12 +++--
arch/powerpc/boot/dts/haleakala.dts | 12 +++--
arch/powerpc/boot/dts/holly.dts | 42 ++++++++--------
arch/powerpc/boot/dts/hotfoot.dts | 12 +++--
arch/powerpc/boot/dts/kuroboxHD.dts | 28 ++++++-----
arch/powerpc/boot/dts/kuroboxHG.dts | 28 ++++++-----
arch/powerpc/boot/dts/lite5200.dts | 12 +++--
arch/powerpc/boot/dts/lite5200b.dts | 22 +++++----
arch/powerpc/boot/dts/media5200.dts | 26 +++++-----
arch/powerpc/boot/dts/mpc5121ads.dts | 20 ++++----
arch/powerpc/boot/dts/mpc8308rdb.dts | 12 +++--
arch/powerpc/boot/dts/mpc8313erdb.dts | 20 ++++----
arch/powerpc/boot/dts/mpc832x_mds.dts | 60 ++++++++++++-----------
arch/powerpc/boot/dts/mpc832x_rdb.dts | 22 +++++----
arch/powerpc/boot/dts/mpc8349emitxgp.dts | 8 +--
arch/powerpc/boot/dts/mpc836x_mds.dts | 60 ++++++++++++-----------
arch/powerpc/boot/dts/mpc836x_rdk.dts | 16 +++---
arch/powerpc/boot/dts/mucmc52.dts | 12 +++--
arch/powerpc/boot/dts/mvme5100.dts | 48 +++++++++---------
arch/powerpc/boot/dts/pcm030.dts | 22 +++++----
arch/powerpc/boot/dts/pcm032.dts | 22 +++++----
arch/powerpc/boot/dts/pq2fads.dts | 28 ++++++-----
arch/powerpc/boot/dts/socrates.dts | 8 +--
arch/powerpc/boot/dts/storcenter.dts | 28 ++++++-----
arch/powerpc/boot/dts/stx_gp3_8560.dts | 36 +++++++-------
arch/powerpc/boot/dts/taishan.dts | 20 ++++----
arch/powerpc/boot/dts/tqm5200.dts | 12 +++--
arch/powerpc/boot/dts/tqm8540.dts | 16 +++---
arch/powerpc/boot/dts/tqm8541.dts | 16 +++---
arch/powerpc/boot/dts/tqm8555.dts | 16 +++---
arch/powerpc/boot/dts/tqm8560.dts | 16 +++---
arch/powerpc/boot/dts/virtex440-ml510.dts | 43 ++++++++--------
arch/powerpc/boot/dts/xcalibur1501.dts | 13 +++--
arch/powerpc/boot/dts/xpedite5200.dts | 8 +--
36 files changed, 437 insertions(+), 363 deletions(-)
diff --git a/arch/powerpc/boot/dts/bluestone.dts b/arch/powerpc/boot/dts/bluestone.dts
index cc965a1816b6..851b6f764ec3 100644
--- a/arch/powerpc/boot/dts/bluestone.dts
+++ b/arch/powerpc/boot/dts/bluestone.dts
@@ -8,6 +8,8 @@
/dts-v1/;
+#include <dt-bindings/interrupt-controller/irq.h>
+
/ {
#address-cells = <2>;
#size-cells = <1>;
@@ -359,12 +361,12 @@
* below are basically de-swizzled numbers.
* The real slot is on idsel 0, so the swizzling is 1:1
*/
- interrupt-map-mask = <0x0 0x0 0x0 0x7>;
+ interrupt-map-mask = <0x0 0x0 0x0 IRQ_INT_ALL>;
interrupt-map = <
- 0x0 0x0 0x0 0x1 &UIC3 0xc 0x4 /* swizzled int A */
- 0x0 0x0 0x0 0x2 &UIC3 0xd 0x4 /* swizzled int B */
- 0x0 0x0 0x0 0x3 &UIC3 0xe 0x4 /* swizzled int C */
- 0x0 0x0 0x0 0x4 &UIC3 0xf 0x4 /* swizzled int D */>;
+ 0x0 0x0 0x0 IRQ_INTA &UIC3 0xc 0x4 /* swizzled int A */
+ 0x0 0x0 0x0 IRQ_INTB &UIC3 0xd 0x4 /* swizzled int B */
+ 0x0 0x0 0x0 IRQ_INTC &UIC3 0xe 0x4 /* swizzled int C */
+ 0x0 0x0 0x0 IRQ_INTD &UIC3 0xf 0x4 /* swizzled int D */>;
};
MSI: ppc4xx-msi@C10000000 {
diff --git a/arch/powerpc/boot/dts/charon.dts b/arch/powerpc/boot/dts/charon.dts
index 408b486b13df..0e2fe2511c46 100644
--- a/arch/powerpc/boot/dts/charon.dts
+++ b/arch/powerpc/boot/dts/charon.dts
@@ -11,6 +11,8 @@
/dts-v1/;
+#include <dt-bindings/interrupt-controller/irq.h>
+
/ {
model = "anon,charon";
compatible = "anon,charon";
@@ -217,11 +219,11 @@
device_type = "pci";
compatible = "fsl,mpc5200-pci";
reg = <0xf0000d00 0x100>;
- interrupt-map-mask = <0xf800 0 0 7>;
- interrupt-map = <0xc000 0 0 1 &mpc5200_pic 0 0 3
- 0xc000 0 0 2 &mpc5200_pic 0 0 3
- 0xc000 0 0 3 &mpc5200_pic 0 0 3
- 0xc000 0 0 4 &mpc5200_pic 0 0 3>;
+ interrupt-map-mask = <0xf800 0 0 IRQ_INT_ALL>;
+ interrupt-map = <0xc000 0 0 IRQ_INTA &mpc5200_pic 0 0 3
+ 0xc000 0 0 IRQ_INTB &mpc5200_pic 0 0 3
+ 0xc000 0 0 IRQ_INTC &mpc5200_pic 0 0 3
+ 0xc000 0 0 IRQ_INTD &mpc5200_pic 0 0 3>;
clock-frequency = <0>; // From boot loader
interrupts = <2 8 0 2 9 0 2 10 0>;
bus-range = <0 0>;
diff --git a/arch/powerpc/boot/dts/digsy_mtc.dts b/arch/powerpc/boot/dts/digsy_mtc.dts
index 0e5e9d3acf79..292492af7b96 100644
--- a/arch/powerpc/boot/dts/digsy_mtc.dts
+++ b/arch/powerpc/boot/dts/digsy_mtc.dts
@@ -9,6 +9,8 @@
/include/ "mpc5200b.dtsi"
+#include <dt-bindings/interrupt-controller/irq.h>
+
&gpt0 { gpio-controller; fsl,has-wdt; };
&gpt1 { gpio-controller; };
@@ -90,11 +92,11 @@
};
pci@f0000d00 {
- interrupt-map-mask = <0xf800 0 0 7>;
- interrupt-map = <0xc000 0 0 1 &mpc5200_pic 0 0 3
- 0xc000 0 0 2 &mpc5200_pic 0 0 3
- 0xc000 0 0 3 &mpc5200_pic 0 0 3
- 0xc000 0 0 4 &mpc5200_pic 0 0 3>;
+ interrupt-map-mask = <0xf800 0 0 IRQ_INT_ALL>;
+ interrupt-map = <0xc000 0 0 IRQ_INTA &mpc5200_pic 0 0 3
+ 0xc000 0 0 IRQ_INTB &mpc5200_pic 0 0 3
+ 0xc000 0 0 IRQ_INTC &mpc5200_pic 0 0 3
+ 0xc000 0 0 IRQ_INTD &mpc5200_pic 0 0 3>;
clock-frequency = <0>; // From boot loader
interrupts = <2 8 0 2 9 0 2 10 0>;
bus-range = <0 0>;
diff --git a/arch/powerpc/boot/dts/haleakala.dts b/arch/powerpc/boot/dts/haleakala.dts
index cb16dad43c92..c03bce619c32 100644
--- a/arch/powerpc/boot/dts/haleakala.dts
+++ b/arch/powerpc/boot/dts/haleakala.dts
@@ -10,6 +10,8 @@
/dts-v1/;
+#include <dt-bindings/interrupt-controller/irq.h>
+
/ {
#address-cells = <1>;
#size-cells = <1>;
@@ -270,12 +272,12 @@
* below are basically de-swizzled numbers.
* The real slot is on idsel 0, so the swizzling is 1:1
*/
- interrupt-map-mask = <0x0 0x0 0x0 0x7>;
+ interrupt-map-mask = <0x0 0x0 0x0 IRQ_INT_ALL>;
interrupt-map = <
- 0x0 0x0 0x0 0x1 &UIC2 0x0 0x4 /* swizzled int A */
- 0x0 0x0 0x0 0x2 &UIC2 0x1 0x4 /* swizzled int B */
- 0x0 0x0 0x0 0x3 &UIC2 0x2 0x4 /* swizzled int C */
- 0x0 0x0 0x0 0x4 &UIC2 0x3 0x4 /* swizzled int D */>;
+ 0x0 0x0 0x0 IRQ_INTA &UIC2 0x0 0x4 /* swizzled int A */
+ 0x0 0x0 0x0 IRQ_INTB &UIC2 0x1 0x4 /* swizzled int B */
+ 0x0 0x0 0x0 IRQ_INTC &UIC2 0x2 0x4 /* swizzled int C */
+ 0x0 0x0 0x0 IRQ_INTD &UIC2 0x3 0x4 /* swizzled int D */>;
};
};
};
diff --git a/arch/powerpc/boot/dts/holly.dts b/arch/powerpc/boot/dts/holly.dts
index 02bd304c7d38..984cf22c8ed9 100644
--- a/arch/powerpc/boot/dts/holly.dts
+++ b/arch/powerpc/boot/dts/holly.dts
@@ -12,6 +12,8 @@
/dts-v1/;
+#include <dt-bindings/interrupt-controller/irq.h>
+
/ {
model = "41K7339";
compatible = "ibm,holly";
@@ -152,30 +154,30 @@
clock-frequency = <133333332>;
interrupt-parent = <&MPIC>;
interrupts = <0x17 0x2>;
- interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+ interrupt-map-mask = <0xf800 0x0 0x0 IRQ_INT_ALL>;
/*----------------------------------------------------+
| The INTA, INTB, INTC, INTD are shared.
+----------------------------------------------------*/
interrupt-map = <
- 0x800 0x0 0x0 0x1 &RT0 0x24 0x0
- 0x800 0x0 0x0 0x2 &RT0 0x25 0x0
- 0x800 0x0 0x0 0x3 &RT0 0x26 0x0
- 0x800 0x0 0x0 0x4 &RT0 0x27 0x0
-
- 0x1000 0x0 0x0 0x1 &RT0 0x25 0x0
- 0x1000 0x0 0x0 0x2 &RT0 0x26 0x0
- 0x1000 0x0 0x0 0x3 &RT0 0x27 0x0
- 0x1000 0x0 0x0 0x4 &RT0 0x24 0x0
-
- 0x1800 0x0 0x0 0x1 &RT0 0x26 0x0
- 0x1800 0x0 0x0 0x2 &RT0 0x27 0x0
- 0x1800 0x0 0x0 0x3 &RT0 0x24 0x0
- 0x1800 0x0 0x0 0x4 &RT0 0x25 0x0
-
- 0x2000 0x0 0x0 0x1 &RT0 0x27 0x0
- 0x2000 0x0 0x0 0x2 &RT0 0x24 0x0
- 0x2000 0x0 0x0 0x3 &RT0 0x25 0x0
- 0x2000 0x0 0x0 0x4 &RT0 0x26 0x0
+ 0x800 0x0 0x0 IRQ_INTA &RT0 0x24 0x0
+ 0x800 0x0 0x0 IRQ_INTB &RT0 0x25 0x0
+ 0x800 0x0 0x0 IRQ_INTC &RT0 0x26 0x0
+ 0x800 0x0 0x0 IRQ_INTD &RT0 0x27 0x0
+
+ 0x1000 0x0 0x0 IRQ_INTA &RT0 0x25 0x0
+ 0x1000 0x0 0x0 IRQ_INTB &RT0 0x26 0x0
+ 0x1000 0x0 0x0 IRQ_INTC &RT0 0x27 0x0
+ 0x1000 0x0 0x0 IRQ_INTD &RT0 0x24 0x0
+
+ 0x1800 0x0 0x0 IRQ_INTA &RT0 0x26 0x0
+ 0x1800 0x0 0x0 IRQ_INTB &RT0 0x27 0x0
+ 0x1800 0x0 0x0 IRQ_INTC &RT0 0x24 0x0
+ 0x1800 0x0 0x0 IRQ_INTD &RT0 0x25 0x0
+
+ 0x2000 0x0 0x0 IRQ_INTA &RT0 0x27 0x0
+ 0x2000 0x0 0x0 IRQ_INTB &RT0 0x24 0x0
+ 0x2000 0x0 0x0 IRQ_INTC &RT0 0x25 0x0
+ 0x2000 0x0 0x0 IRQ_INTD &RT0 0x26 0x0
>;
RT0: router@1180 {
diff --git a/arch/powerpc/boot/dts/hotfoot.dts b/arch/powerpc/boot/dts/hotfoot.dts
index b93bf2d9dd5b..d086b881197f 100644
--- a/arch/powerpc/boot/dts/hotfoot.dts
+++ b/arch/powerpc/boot/dts/hotfoot.dts
@@ -10,6 +10,8 @@
/dts-v1/;
+#include <dt-bindings/interrupt-controller/irq.h>
+
/ {
#address-cells = <1>;
#size-cells = <1>;
@@ -277,15 +279,15 @@
dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x80000000>;
interrupt-parent = <&UIC0>;
- interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+ interrupt-map-mask = <0xf800 0x0 0x0 IRQ_INT_ALL>;
interrupt-map = <
/* IDSEL 3 -- slot1 (optional) 27/29 A/B IRQ2/4 */
- 0x1800 0x0 0x0 0x1 &UIC0 0x1b 0x8
- 0x1800 0x0 0x0 0x2 &UIC0 0x1d 0x8
+ 0x1800 0x0 0x0 IRQ_INTA &UIC0 0x1b 0x8
+ 0x1800 0x0 0x0 IRQ_INTB &UIC0 0x1d 0x8
/* IDSEL 4 -- slot0, 26/28 A/B IRQ1/3 */
- 0x2000 0x0 0x0 0x1 &UIC0 0x1a 0x8
- 0x2000 0x0 0x0 0x2 &UIC0 0x1c 0x8
+ 0x2000 0x0 0x0 IRQ_INTA &UIC0 0x1a 0x8
+ 0x2000 0x0 0x0 IRQ_INTB &UIC0 0x1c 0x8
>;
};
};
diff --git a/arch/powerpc/boot/dts/kuroboxHD.dts b/arch/powerpc/boot/dts/kuroboxHD.dts
index 0a4545159e80..d709fe5efd49 100644
--- a/arch/powerpc/boot/dts/kuroboxHD.dts
+++ b/arch/powerpc/boot/dts/kuroboxHD.dts
@@ -20,6 +20,8 @@ XXXX add flash parts, rtc, ??
/dts-v1/;
+#include <dt-bindings/interrupt-controller/irq.h>
+
/ {
model = "KuroboxHD";
compatible = "linkstation";
@@ -124,23 +126,23 @@ XXXX add flash parts, rtc, ??
bus-range = <0 255>;
clock-frequency = <133333333>;
interrupt-parent = <&mpic>;
- interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+ interrupt-map-mask = <0xf800 0x0 0x0 IRQ_INT_ALL>;
interrupt-map = <
/* IDSEL 11 - IRQ0 ETH */
- 0x5800 0x0 0x0 0x1 &mpic 0x0 0x1
- 0x5800 0x0 0x0 0x2 &mpic 0x1 0x1
- 0x5800 0x0 0x0 0x3 &mpic 0x2 0x1
- 0x5800 0x0 0x0 0x4 &mpic 0x3 0x1
+ 0x5800 0x0 0x0 IRQ_INTA &mpic 0x0 0x1
+ 0x5800 0x0 0x0 IRQ_INTB &mpic 0x1 0x1
+ 0x5800 0x0 0x0 IRQ_INTC &mpic 0x2 0x1
+ 0x5800 0x0 0x0 IRQ_INTD &mpic 0x3 0x1
/* IDSEL 12 - IRQ1 IDE0 */
- 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 0x0 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 0x0 0x1
/* IDSEL 14 - IRQ3 USB2.0 */
- 0x7000 0x0 0x0 0x1 &mpic 0x3 0x1
- 0x7000 0x0 0x0 0x2 &mpic 0x3 0x1
- 0x7000 0x0 0x0 0x3 &mpic 0x3 0x1
- 0x7000 0x0 0x0 0x4 &mpic 0x3 0x1
+ 0x7000 0x0 0x0 IRQ_INTA &mpic 0x3 0x1
+ 0x7000 0x0 0x0 IRQ_INTB &mpic 0x3 0x1
+ 0x7000 0x0 0x0 IRQ_INTC &mpic 0x3 0x1
+ 0x7000 0x0 0x0 IRQ_INTD &mpic 0x3 0x1
>;
};
};
diff --git a/arch/powerpc/boot/dts/kuroboxHG.dts b/arch/powerpc/boot/dts/kuroboxHG.dts
index 0e758b347cdb..5b392aca3a63 100644
--- a/arch/powerpc/boot/dts/kuroboxHG.dts
+++ b/arch/powerpc/boot/dts/kuroboxHG.dts
@@ -20,6 +20,8 @@ XXXX add flash parts, rtc, ??
/dts-v1/;
+#include <dt-bindings/interrupt-controller/irq.h>
+
/ {
model = "KuroboxHG";
compatible = "linkstation";
@@ -124,23 +126,23 @@ XXXX add flash parts, rtc, ??
bus-range = <0 255>;
clock-frequency = <133333333>;
interrupt-parent = <&mpic>;
- interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+ interrupt-map-mask = <0xf800 0x0 0x0 IRQ_INT_ALL>;
interrupt-map = <
/* IDSEL 11 - IRQ0 ETH */
- 0x5800 0x0 0x0 0x1 &mpic 0x0 0x1
- 0x5800 0x0 0x0 0x2 &mpic 0x1 0x1
- 0x5800 0x0 0x0 0x3 &mpic 0x2 0x1
- 0x5800 0x0 0x0 0x4 &mpic 0x3 0x1
+ 0x5800 0x0 0x0 IRQ_INTA &mpic 0x0 0x1
+ 0x5800 0x0 0x0 IRQ_INTB &mpic 0x1 0x1
+ 0x5800 0x0 0x0 IRQ_INTC &mpic 0x2 0x1
+ 0x5800 0x0 0x0 IRQ_INTD &mpic 0x3 0x1
/* IDSEL 12 - IRQ1 IDE0 */
- 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 0x0 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 0x0 0x1
/* IDSEL 14 - IRQ3 USB2.0 */
- 0x7000 0x0 0x0 0x1 &mpic 0x3 0x1
- 0x7000 0x0 0x0 0x2 &mpic 0x3 0x1
- 0x7000 0x0 0x0 0x3 &mpic 0x3 0x1
- 0x7000 0x0 0x0 0x4 &mpic 0x3 0x1
+ 0x7000 0x0 0x0 IRQ_INTA &mpic 0x3 0x1
+ 0x7000 0x0 0x0 IRQ_INTB &mpic 0x3 0x1
+ 0x7000 0x0 0x0 IRQ_INTC &mpic 0x3 0x1
+ 0x7000 0x0 0x0 IRQ_INTD &mpic 0x3 0x1
>;
};
};
diff --git a/arch/powerpc/boot/dts/lite5200.dts b/arch/powerpc/boot/dts/lite5200.dts
index cb2782dd6132..8ab828853f4b 100644
--- a/arch/powerpc/boot/dts/lite5200.dts
+++ b/arch/powerpc/boot/dts/lite5200.dts
@@ -8,6 +8,8 @@
/dts-v1/;
+#include <dt-bindings/interrupt-controller/irq.h>
+
/ {
model = "fsl,lite5200";
compatible = "fsl,lite5200";
@@ -275,11 +277,11 @@
device_type = "pci";
compatible = "fsl,mpc5200-pci";
reg = <0xf0000d00 0x100>;
- interrupt-map-mask = <0xf800 0 0 7>;
- interrupt-map = <0xc000 0 0 1 &mpc5200_pic 0 0 3
- 0xc000 0 0 2 &mpc5200_pic 0 0 3
- 0xc000 0 0 3 &mpc5200_pic 0 0 3
- 0xc000 0 0 4 &mpc5200_pic 0 0 3>;
+ interrupt-map-mask = <0xf800 0 0 IRQ_INT_ALL>;
+ interrupt-map = <0xc000 0 0 IRQ_INTA &mpc5200_pic 0 0 3
+ 0xc000 0 0 IRQ_INTB &mpc5200_pic 0 0 3
+ 0xc000 0 0 IRQ_INTC &mpc5200_pic 0 0 3
+ 0xc000 0 0 IRQ_INTD &mpc5200_pic 0 0 3>;
clock-frequency = <0>; // From boot loader
interrupts = <2 8 0 2 9 0 2 10 0>;
bus-range = <0 0>;
diff --git a/arch/powerpc/boot/dts/lite5200b.dts b/arch/powerpc/boot/dts/lite5200b.dts
index 2b86c81f9048..4913accba301 100644
--- a/arch/powerpc/boot/dts/lite5200b.dts
+++ b/arch/powerpc/boot/dts/lite5200b.dts
@@ -8,6 +8,8 @@
/include/ "mpc5200b.dtsi"
+#include <dt-bindings/interrupt-controller/irq.h>
+
&gpt0 { fsl,has-wdt; };
&gpt2 { gpio-controller; };
&gpt3 { gpio-controller; };
@@ -103,16 +105,16 @@
};
pci@f0000d00 {
- interrupt-map-mask = <0xf800 0 0 7>;
- interrupt-map = <0xc000 0 0 1 &mpc5200_pic 0 0 3 // 1st slot
- 0xc000 0 0 2 &mpc5200_pic 1 1 3
- 0xc000 0 0 3 &mpc5200_pic 1 2 3
- 0xc000 0 0 4 &mpc5200_pic 1 3 3
-
- 0xc800 0 0 1 &mpc5200_pic 1 1 3 // 2nd slot
- 0xc800 0 0 2 &mpc5200_pic 1 2 3
- 0xc800 0 0 3 &mpc5200_pic 1 3 3
- 0xc800 0 0 4 &mpc5200_pic 0 0 3>;
+ interrupt-map-mask = <0xf800 0 0 IRQ_INT_ALL>;
+ interrupt-map = <0xc000 0 0 IRQ_INTA &mpc5200_pic 0 0 3 // 1st slot
+ 0xc000 0 0 IRQ_INTB &mpc5200_pic 1 1 3
+ 0xc000 0 0 IRQ_INTC &mpc5200_pic 1 2 3
+ 0xc000 0 0 IRQ_INTD &mpc5200_pic 1 3 3
+
+ 0xc800 0 0 IRQ_INTA &mpc5200_pic 1 1 3 // 2nd slot
+ 0xc800 0 0 IRQ_INTB &mpc5200_pic 1 2 3
+ 0xc800 0 0 IRQ_INTC &mpc5200_pic 1 3 3
+ 0xc800 0 0 IRQ_INTD &mpc5200_pic 0 0 3>;
clock-frequency = <0>; // From boot loader
interrupts = <2 8 0 2 9 0 2 10 0>;
bus-range = <0 0>;
diff --git a/arch/powerpc/boot/dts/media5200.dts b/arch/powerpc/boot/dts/media5200.dts
index 61cae9dcddef..a92e46f7e962 100644
--- a/arch/powerpc/boot/dts/media5200.dts
+++ b/arch/powerpc/boot/dts/media5200.dts
@@ -9,6 +9,8 @@
/include/ "mpc5200b.dtsi"
+#include <dt-bindings/interrupt-controller/irq.h>
+
&gpt0 { fsl,has-wdt; };
/ {
@@ -80,21 +82,21 @@
};
pci@f0000d00 {
- interrupt-map-mask = <0xf800 0 0 7>;
- interrupt-map = <0xc000 0 0 1 &media5200_fpga 0 2 // 1st slot
- 0xc000 0 0 2 &media5200_fpga 0 3
- 0xc000 0 0 3 &media5200_fpga 0 4
- 0xc000 0 0 4 &media5200_fpga 0 5
+ interrupt-map-mask = <0xf800 0 0 IRQ_INT_ALL>;
+ interrupt-map = <0xc000 0 0 IRQ_INTA &media5200_fpga 0 2 // 1st slot
+ 0xc000 0 0 IRQ_INTB &media5200_fpga 0 3
+ 0xc000 0 0 IRQ_INTC &media5200_fpga 0 4
+ 0xc000 0 0 IRQ_INTD &media5200_fpga 0 5
- 0xc800 0 0 1 &media5200_fpga 0 3 // 2nd slot
- 0xc800 0 0 2 &media5200_fpga 0 4
- 0xc800 0 0 3 &media5200_fpga 0 5
- 0xc800 0 0 4 &media5200_fpga 0 2
+ 0xc800 0 0 IRQ_INTA &media5200_fpga 0 3 // 2nd slot
+ 0xc800 0 0 IRQ_INTB &media5200_fpga 0 4
+ 0xc800 0 0 IRQ_INTC &media5200_fpga 0 5
+ 0xc800 0 0 IRQ_INTD &media5200_fpga 0 2
- 0xd000 0 0 1 &media5200_fpga 0 4 // miniPCI
- 0xd000 0 0 2 &media5200_fpga 0 5
+ 0xd000 0 0 IRQ_INTA &media5200_fpga 0 4 // miniPCI
+ 0xd000 0 0 IRQ_INTB &media5200_fpga 0 5
- 0xe000 0 0 1 &media5200_fpga 0 5 // CoralIP
+ 0xe000 0 0 IRQ_INTA &media5200_fpga 0 5 // CoralIP
>;
ranges = <0x42000000 0 0x80000000 0x80000000 0 0x20000000
0x02000000 0 0xa0000000 0xa0000000 0 0x10000000
diff --git a/arch/powerpc/boot/dts/mpc5121ads.dts b/arch/powerpc/boot/dts/mpc5121ads.dts
index b407a50ee622..9aeb924ab52f 100644
--- a/arch/powerpc/boot/dts/mpc5121ads.dts
+++ b/arch/powerpc/boot/dts/mpc5121ads.dts
@@ -7,6 +7,8 @@
#include "mpc5121.dtsi"
+#include <dt-bindings/interrupt-controller/irq.h>
+
/ {
model = "mpc5121ads";
compatible = "fsl,mpc5121ads", "fsl,mpc5121";
@@ -154,21 +156,21 @@
};
pci: pci@80008500 {
- interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+ interrupt-map-mask = <0xf800 0x0 0x0 IRQ_INT_ALL>;
interrupt-map = <
/* IDSEL 0x15 - Slot 1 PCI */
- 0xa800 0x0 0x0 0x1 &cpld_pic 0x0 0x8
- 0xa800 0x0 0x0 0x2 &cpld_pic 0x1 0x8
- 0xa800 0x0 0x0 0x3 &cpld_pic 0x2 0x8
- 0xa800 0x0 0x0 0x4 &cpld_pic 0x3 0x8
+ 0xa800 0x0 0x0 IRQ_INTA &cpld_pic 0x0 0x8
+ 0xa800 0x0 0x0 IRQ_INTB &cpld_pic 0x1 0x8
+ 0xa800 0x0 0x0 IRQ_INTC &cpld_pic 0x2 0x8
+ 0xa800 0x0 0x0 IRQ_INTD &cpld_pic 0x3 0x8
/* IDSEL 0x16 - Slot 2 MiniPCI */
- 0xb000 0x0 0x0 0x1 &cpld_pic 0x4 0x8
- 0xb000 0x0 0x0 0x2 &cpld_pic 0x5 0x8
+ 0xb000 0x0 0x0 IRQ_INTA &cpld_pic 0x4 0x8
+ 0xb000 0x0 0x0 IRQ_INTB &cpld_pic 0x5 0x8
/* IDSEL 0x17 - Slot 3 MiniPCI */
- 0xb800 0x0 0x0 0x1 &cpld_pic 0x6 0x8
- 0xb800 0x0 0x0 0x2 &cpld_pic 0x7 0x8
+ 0xb800 0x0 0x0 IRQ_INTA &cpld_pic 0x6 0x8
+ 0xb800 0x0 0x0 IRQ_INTB &cpld_pic 0x7 0x8
>;
};
};
diff --git a/arch/powerpc/boot/dts/mpc8308rdb.dts b/arch/powerpc/boot/dts/mpc8308rdb.dts
index af2ed8380a86..0e9031b1a22b 100644
--- a/arch/powerpc/boot/dts/mpc8308rdb.dts
+++ b/arch/powerpc/boot/dts/mpc8308rdb.dts
@@ -8,6 +8,8 @@
/dts-v1/;
+#include <dt-bindings/interrupt-controller/irq.h>
+
/ {
compatible = "fsl,mpc8308rdb";
#address-cells = <1>;
@@ -281,11 +283,11 @@
ranges = <0x02000000 0 0xa0000000 0xa0000000 0 0x10000000
0x01000000 0 0x00000000 0xb1000000 0 0x00800000>;
bus-range = <0 0>;
- interrupt-map-mask = <0xf800 0 0 7>;
- interrupt-map = <0 0 0 1 &ipic 1 8
- 0 0 0 2 &ipic 1 8
- 0 0 0 3 &ipic 1 8
- 0 0 0 4 &ipic 1 8>;
+ interrupt-map-mask = <0xf800 0 0 IRQ_INT_ALL>;
+ interrupt-map = <0 0 0 IRQ_INTA &ipic 1 8
+ 0 0 0 IRQ_INTB &ipic 1 8
+ 0 0 0 IRQ_INTC &ipic 1 8
+ 0 0 0 IRQ_INTD &ipic 1 8>;
interrupts = <0x1 0x8>;
interrupt-parent = <&ipic>;
clock-frequency = <0>;
diff --git a/arch/powerpc/boot/dts/mpc8313erdb.dts b/arch/powerpc/boot/dts/mpc8313erdb.dts
index a8315795b2c9..99513c9a76eb 100644
--- a/arch/powerpc/boot/dts/mpc8313erdb.dts
+++ b/arch/powerpc/boot/dts/mpc8313erdb.dts
@@ -7,6 +7,8 @@
/dts-v1/;
+#include <dt-bindings/interrupt-controller/irq.h>
+
/ {
model = "MPC8313ERDB";
compatible = "MPC8313ERDB", "MPC831xRDB", "MPC83xxRDB";
@@ -327,19 +329,19 @@
pci0: pci@e0008500 {
cell-index = <1>;
- interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+ interrupt-map-mask = <0xf800 0x0 0x0 IRQ_INT_ALL>;
interrupt-map = <
/* IDSEL 0x0E -mini PCI */
- 0x7000 0x0 0x0 0x1 &ipic 18 0x8
- 0x7000 0x0 0x0 0x2 &ipic 18 0x8
- 0x7000 0x0 0x0 0x3 &ipic 18 0x8
- 0x7000 0x0 0x0 0x4 &ipic 18 0x8
+ 0x7000 0x0 0x0 IRQ_INTA &ipic 18 0x8
+ 0x7000 0x0 0x0 IRQ_INTB &ipic 18 0x8
+ 0x7000 0x0 0x0 IRQ_INTC &ipic 18 0x8
+ 0x7000 0x0 0x0 IRQ_INTD &ipic 18 0x8
/* IDSEL 0x0F - PCI slot */
- 0x7800 0x0 0x0 0x1 &ipic 17 0x8
- 0x7800 0x0 0x0 0x2 &ipic 18 0x8
- 0x7800 0x0 0x0 0x3 &ipic 17 0x8
- 0x7800 0x0 0x0 0x4 &ipic 18 0x8>;
+ 0x7800 0x0 0x0 IRQ_INTA &ipic 17 0x8
+ 0x7800 0x0 0x0 IRQ_INTB &ipic 18 0x8
+ 0x7800 0x0 0x0 IRQ_INTC &ipic 17 0x8
+ 0x7800 0x0 0x0 IRQ_INTD &ipic 18 0x8>;
interrupt-parent = <&ipic>;
interrupts = <66 0x8>;
bus-range = <0x0 0x0>;
diff --git a/arch/powerpc/boot/dts/mpc832x_mds.dts b/arch/powerpc/boot/dts/mpc832x_mds.dts
index 3af073f01e71..38a0772e9c66 100644
--- a/arch/powerpc/boot/dts/mpc832x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc832x_mds.dts
@@ -20,6 +20,8 @@
/dts-v1/;
+#include <dt-bindings/interrupt-controller/irq.h>
+
/ {
model = "MPC8323EMDS";
compatible = "MPC8323EMDS", "MPC832xMDS", "MPC83xxMDS";
@@ -374,49 +376,49 @@
};
pci0: pci@e0008500 {
- interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+ interrupt-map-mask = <0xf800 0x0 0x0 IRQ_INT_ALL>;
interrupt-map = <
/* IDSEL 0x11 AD17 */
- 0x8800 0x0 0x0 0x1 &ipic 20 0x8
- 0x8800 0x0 0x0 0x2 &ipic 21 0x8
- 0x8800 0x0 0x0 0x3 &ipic 22 0x8
- 0x8800 0x0 0x0 0x4 &ipic 23 0x8
+ 0x8800 0x0 0x0 IRQ_INTA &ipic 20 0x8
+ 0x8800 0x0 0x0 IRQ_INTB &ipic 21 0x8
+ 0x8800 0x0 0x0 IRQ_INTC &ipic 22 0x8
+ 0x8800 0x0 0x0 IRQ_INTD &ipic 23 0x8
/* IDSEL 0x12 AD18 */
- 0x9000 0x0 0x0 0x1 &ipic 22 0x8
- 0x9000 0x0 0x0 0x2 &ipic 23 0x8
- 0x9000 0x0 0x0 0x3 &ipic 20 0x8
- 0x9000 0x0 0x0 0x4 &ipic 21 0x8
+ 0x9000 0x0 0x0 IRQ_INTA &ipic 22 0x8
+ 0x9000 0x0 0x0 IRQ_INTB &ipic 23 0x8
+ 0x9000 0x0 0x0 IRQ_INTC &ipic 20 0x8
+ 0x9000 0x0 0x0 IRQ_INTD &ipic 21 0x8
/* IDSEL 0x13 AD19 */
- 0x9800 0x0 0x0 0x1 &ipic 23 0x8
- 0x9800 0x0 0x0 0x2 &ipic 20 0x8
- 0x9800 0x0 0x0 0x3 &ipic 21 0x8
- 0x9800 0x0 0x0 0x4 &ipic 22 0x8
+ 0x9800 0x0 0x0 IRQ_INTA &ipic 23 0x8
+ 0x9800 0x0 0x0 IRQ_INTB &ipic 20 0x8
+ 0x9800 0x0 0x0 IRQ_INTC &ipic 21 0x8
+ 0x9800 0x0 0x0 IRQ_INTD &ipic 22 0x8
/* IDSEL 0x15 AD21*/
- 0xa800 0x0 0x0 0x1 &ipic 20 0x8
- 0xa800 0x0 0x0 0x2 &ipic 21 0x8
- 0xa800 0x0 0x0 0x3 &ipic 22 0x8
- 0xa800 0x0 0x0 0x4 &ipic 23 0x8
+ 0xa800 0x0 0x0 IRQ_INTA &ipic 20 0x8
+ 0xa800 0x0 0x0 IRQ_INTB &ipic 21 0x8
+ 0xa800 0x0 0x0 IRQ_INTC &ipic 22 0x8
+ 0xa800 0x0 0x0 IRQ_INTD &ipic 23 0x8
/* IDSEL 0x16 AD22*/
- 0xb000 0x0 0x0 0x1 &ipic 23 0x8
- 0xb000 0x0 0x0 0x2 &ipic 20 0x8
- 0xb000 0x0 0x0 0x3 &ipic 21 0x8
- 0xb000 0x0 0x0 0x4 &ipic 22 0x8
+ 0xb000 0x0 0x0 IRQ_INTA &ipic 23 0x8
+ 0xb000 0x0 0x0 IRQ_INTB &ipic 20 0x8
+ 0xb000 0x0 0x0 IRQ_INTC &ipic 21 0x8
+ 0xb000 0x0 0x0 IRQ_INTD &ipic 22 0x8
/* IDSEL 0x17 AD23*/
- 0xb800 0x0 0x0 0x1 &ipic 22 0x8
- 0xb800 0x0 0x0 0x2 &ipic 23 0x8
- 0xb800 0x0 0x0 0x3 &ipic 20 0x8
- 0xb800 0x0 0x0 0x4 &ipic 21 0x8
+ 0xb800 0x0 0x0 IRQ_INTA &ipic 22 0x8
+ 0xb800 0x0 0x0 IRQ_INTB &ipic 23 0x8
+ 0xb800 0x0 0x0 IRQ_INTC &ipic 20 0x8
+ 0xb800 0x0 0x0 IRQ_INTD &ipic 21 0x8
/* IDSEL 0x18 AD24*/
- 0xc000 0x0 0x0 0x1 &ipic 21 0x8
- 0xc000 0x0 0x0 0x2 &ipic 22 0x8
- 0xc000 0x0 0x0 0x3 &ipic 23 0x8
- 0xc000 0x0 0x0 0x4 &ipic 20 0x8>;
+ 0xc000 0x0 0x0 IRQ_INTA &ipic 21 0x8
+ 0xc000 0x0 0x0 IRQ_INTB &ipic 22 0x8
+ 0xc000 0x0 0x0 IRQ_INTC &ipic 23 0x8
+ 0xc000 0x0 0x0 IRQ_INTD &ipic 20 0x8>;
interrupt-parent = <&ipic>;
interrupts = <66 0x8>;
bus-range = <0x0 0x0>;
diff --git a/arch/powerpc/boot/dts/mpc832x_rdb.dts b/arch/powerpc/boot/dts/mpc832x_rdb.dts
index b6257186528e..2e74f104ac93 100644
--- a/arch/powerpc/boot/dts/mpc832x_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts
@@ -7,6 +7,8 @@
/dts-v1/;
+#include <dt-bindings/interrupt-controller/irq.h>
+
/ {
model = "MPC8323ERDB";
compatible = "MPC8323ERDB", "MPC832xRDB", "MPC83xxRDB";
@@ -327,22 +329,22 @@
};
pci0: pci@e0008500 {
- interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+ interrupt-map-mask = <0xf800 0x0 0x0 IRQ_INT_ALL>;
interrupt-map = <
/* IDSEL 0x10 AD16 (USB) */
- 0x8000 0x0 0x0 0x1 &ipic 17 0x8
+ 0x8000 0x0 0x0 IRQ_INTA &ipic 17 0x8
/* IDSEL 0x11 AD17 (Mini1)*/
- 0x8800 0x0 0x0 0x1 &ipic 18 0x8
- 0x8800 0x0 0x0 0x2 &ipic 19 0x8
- 0x8800 0x0 0x0 0x3 &ipic 20 0x8
- 0x8800 0x0 0x0 0x4 &ipic 48 0x8
+ 0x8800 0x0 0x0 IRQ_INTA &ipic 18 0x8
+ 0x8800 0x0 0x0 IRQ_INTB &ipic 19 0x8
+ 0x8800 0x0 0x0 IRQ_INTC &ipic 20 0x8
+ 0x8800 0x0 0x0 IRQ_INTD &ipic 48 0x8
/* IDSEL 0x12 AD18 (PCI/Mini2) */
- 0x9000 0x0 0x0 0x1 &ipic 19 0x8
- 0x9000 0x0 0x0 0x2 &ipic 20 0x8
- 0x9000 0x0 0x0 0x3 &ipic 48 0x8
- 0x9000 0x0 0x0 0x4 &ipic 17 0x8>;
+ 0x9000 0x0 0x0 IRQ_INTA &ipic 19 0x8
+ 0x9000 0x0 0x0 IRQ_INTB &ipic 20 0x8
+ 0x9000 0x0 0x0 IRQ_INTC &ipic 48 0x8
+ 0x9000 0x0 0x0 IRQ_INTD &ipic 17 0x8>;
interrupt-parent = <&ipic>;
interrupts = <66 0x8>;
diff --git a/arch/powerpc/boot/dts/mpc8349emitxgp.dts b/arch/powerpc/boot/dts/mpc8349emitxgp.dts
index bcf68a0a7b55..f218331e0c17 100644
--- a/arch/powerpc/boot/dts/mpc8349emitxgp.dts
+++ b/arch/powerpc/boot/dts/mpc8349emitxgp.dts
@@ -7,6 +7,8 @@
/dts-v1/;
+#include <dt-bindings/interrupt-controller/irq.h>
+
/ {
model = "MPC8349EMITXGP";
compatible = "MPC8349EMITXGP", "MPC834xMITX", "MPC83xxMITX";
@@ -222,11 +224,11 @@
};
pci0: pci@e0008600 {
- interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+ interrupt-map-mask = <0xf800 0x0 0x0 IRQ_INT_ALL>;
interrupt-map = <
/* IDSEL 0x0F - PCI Slot */
- 0x7800 0x0 0x0 0x1 &ipic 20 0x8 /* PCI_INTA */
- 0x7800 0x0 0x0 0x2 &ipic 21 0x8 /* PCI_INTB */
+ 0x7800 0x0 0x0 IRQ_INTA &ipic 20 0x8
+ 0x7800 0x0 0x0 IRQ_INTB &ipic 21 0x8
>;
interrupt-parent = <&ipic>;
interrupts = <67 0x8>;
diff --git a/arch/powerpc/boot/dts/mpc836x_mds.dts b/arch/powerpc/boot/dts/mpc836x_mds.dts
index f4ca12ec57f1..7c5fd0d87df9 100644
--- a/arch/powerpc/boot/dts/mpc836x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc836x_mds.dts
@@ -12,6 +12,8 @@
/dts-v1/;
+#include <dt-bindings/interrupt-controller/irq.h>
+
/ {
model = "MPC8360MDS";
compatible = "MPC8360EMDS", "MPC836xMDS", "MPC83xxMDS";
@@ -418,50 +420,50 @@
};
pci0: pci@e0008500 {
- interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+ interrupt-map-mask = <0xf800 0x0 0x0 IRQ_INT_ALL>;
interrupt-map = <
/* IDSEL 0x11 AD17 */
- 0x8800 0x0 0x0 0x1 &ipic 20 0x8
- 0x8800 0x0 0x0 0x2 &ipic 21 0x8
- 0x8800 0x0 0x0 0x3 &ipic 22 0x8
- 0x8800 0x0 0x0 0x4 &ipic 23 0x8
+ 0x8800 0x0 0x0 IRQ_INTA &ipic 20 0x8
+ 0x8800 0x0 0x0 IRQ_INTB &ipic 21 0x8
+ 0x8800 0x0 0x0 IRQ_INTC &ipic 22 0x8
+ 0x8800 0x0 0x0 IRQ_INTD &ipic 23 0x8
/* IDSEL 0x12 AD18 */
- 0x9000 0x0 0x0 0x1 &ipic 22 0x8
- 0x9000 0x0 0x0 0x2 &ipic 23 0x8
- 0x9000 0x0 0x0 0x3 &ipic 20 0x8
- 0x9000 0x0 0x0 0x4 &ipic 21 0x8
+ 0x9000 0x0 0x0 IRQ_INTA &ipic 22 0x8
+ 0x9000 0x0 0x0 IRQ_INTB &ipic 23 0x8
+ 0x9000 0x0 0x0 IRQ_INTC &ipic 20 0x8
+ 0x9000 0x0 0x0 IRQ_INTD &ipic 21 0x8
/* IDSEL 0x13 AD19 */
- 0x9800 0x0 0x0 0x1 &ipic 23 0x8
- 0x9800 0x0 0x0 0x2 &ipic 20 0x8
- 0x9800 0x0 0x0 0x3 &ipic 21 0x8
- 0x9800 0x0 0x0 0x4 &ipic 22 0x8
+ 0x9800 0x0 0x0 IRQ_INTA &ipic 23 0x8
+ 0x9800 0x0 0x0 IRQ_INTB &ipic 20 0x8
+ 0x9800 0x0 0x0 IRQ_INTC &ipic 21 0x8
+ 0x9800 0x0 0x0 IRQ_INTD &ipic 22 0x8
/* IDSEL 0x15 AD21*/
- 0xa800 0x0 0x0 0x1 &ipic 20 0x8
- 0xa800 0x0 0x0 0x2 &ipic 21 0x8
- 0xa800 0x0 0x0 0x3 &ipic 22 0x8
- 0xa800 0x0 0x0 0x4 &ipic 23 0x8
+ 0xa800 0x0 0x0 IRQ_INTA &ipic 20 0x8
+ 0xa800 0x0 0x0 IRQ_INTB &ipic 21 0x8
+ 0xa800 0x0 0x0 IRQ_INTC &ipic 22 0x8
+ 0xa800 0x0 0x0 IRQ_INTD &ipic 23 0x8
/* IDSEL 0x16 AD22*/
- 0xb000 0x0 0x0 0x1 &ipic 23 0x8
- 0xb000 0x0 0x0 0x2 &ipic 20 0x8
- 0xb000 0x0 0x0 0x3 &ipic 21 0x8
- 0xb000 0x0 0x0 0x4 &ipic 22 0x8
+ 0xb000 0x0 0x0 IRQ_INTA &ipic 23 0x8
+ 0xb000 0x0 0x0 IRQ_INTB &ipic 20 0x8
+ 0xb000 0x0 0x0 IRQ_INTC &ipic 21 0x8
+ 0xb000 0x0 0x0 IRQ_INTD &ipic 22 0x8
/* IDSEL 0x17 AD23*/
- 0xb800 0x0 0x0 0x1 &ipic 22 0x8
- 0xb800 0x0 0x0 0x2 &ipic 23 0x8
- 0xb800 0x0 0x0 0x3 &ipic 20 0x8
- 0xb800 0x0 0x0 0x4 &ipic 21 0x8
+ 0xb800 0x0 0x0 IRQ_INTA &ipic 22 0x8
+ 0xb800 0x0 0x0 IRQ_INTB &ipic 23 0x8
+ 0xb800 0x0 0x0 IRQ_INTC &ipic 20 0x8
+ 0xb800 0x0 0x0 IRQ_INTD &ipic 21 0x8
/* IDSEL 0x18 AD24*/
- 0xc000 0x0 0x0 0x1 &ipic 21 0x8
- 0xc000 0x0 0x0 0x2 &ipic 22 0x8
- 0xc000 0x0 0x0 0x3 &ipic 23 0x8
- 0xc000 0x0 0x0 0x4 &ipic 20 0x8>;
+ 0xc000 0x0 0x0 IRQ_INTA &ipic 21 0x8
+ 0xc000 0x0 0x0 IRQ_INTB &ipic 22 0x8
+ 0xc000 0x0 0x0 IRQ_INTC &ipic 23 0x8
+ 0xc000 0x0 0x0 IRQ_INTD &ipic 20 0x8>;
interrupt-parent = <&ipic>;
interrupts = <66 0x8>;
bus-range = <0 0>;
diff --git a/arch/powerpc/boot/dts/mpc836x_rdk.dts b/arch/powerpc/boot/dts/mpc836x_rdk.dts
index a0cc1953484d..e42529e48341 100644
--- a/arch/powerpc/boot/dts/mpc836x_rdk.dts
+++ b/arch/powerpc/boot/dts/mpc836x_rdk.dts
@@ -10,6 +10,8 @@
/dts-v1/;
+#include <dt-bindings/interrupt-controller/irq.h>
+
/ {
#address-cells = <1>;
#size-cells = <1>;
@@ -445,16 +447,16 @@
0x01000000 0 0xe0300000 0xe0300000 0 0x00100000>;
interrupts = <66 8>;
interrupt-parent = <&ipic>;
- interrupt-map-mask = <0xf800 0 0 7>;
+ interrupt-map-mask = <0xf800 0 0 IRQ_INT_ALL>;
interrupt-map = </* miniPCI0 IDSEL 0x14 AD20 */
- 0xa000 0 0 1 &ipic 18 8
- 0xa000 0 0 2 &ipic 19 8
+ 0xa000 0 0 IRQ_INTA &ipic 18 8
+ 0xa000 0 0 IRQ_INTB &ipic 19 8
/* PCI1 IDSEL 0x15 AD21 */
- 0xa800 0 0 1 &ipic 19 8
- 0xa800 0 0 2 &ipic 20 8
- 0xa800 0 0 3 &ipic 21 8
- 0xa800 0 0 4 &ipic 18 8>;
+ 0xa800 0 0 IRQ_INTA &ipic 19 8
+ 0xa800 0 0 IRQ_INTB &ipic 20 8
+ 0xa800 0 0 IRQ_INTC &ipic 21 8
+ 0xa800 0 0 IRQ_INTD &ipic 18 8>;
sleep = <&pmc 0x00010000>;
/* filled by u-boot */
bus-range = <0 0>;
diff --git a/arch/powerpc/boot/dts/mucmc52.dts b/arch/powerpc/boot/dts/mucmc52.dts
index c6c66306308d..f9e5520b11ab 100644
--- a/arch/powerpc/boot/dts/mucmc52.dts
+++ b/arch/powerpc/boot/dts/mucmc52.dts
@@ -9,6 +9,8 @@
/include/ "mpc5200b.dtsi"
+#include <dt-bindings/interrupt-controller/irq.h>
+
/* Timer pins that need to be in GPIO mode */
&gpt0 { gpio-controller; };
&gpt1 { gpio-controller; };
@@ -98,13 +100,13 @@
};
pci@f0000d00 {
- interrupt-map-mask = <0xf800 0 0 7>;
+ interrupt-map-mask = <0xf800 0 0 IRQ_INT_ALL>;
interrupt-map = <
/* IDSEL 0x10 */
- 0x8000 0 0 1 &mpc5200_pic 0 3 3
- 0x8000 0 0 2 &mpc5200_pic 0 3 3
- 0x8000 0 0 3 &mpc5200_pic 0 2 3
- 0x8000 0 0 4 &mpc5200_pic 0 1 3
+ 0x8000 0 0 IRQ_INTA &mpc5200_pic 0 3 3
+ 0x8000 0 0 IRQ_INTB &mpc5200_pic 0 3 3
+ 0x8000 0 0 IRQ_INTC &mpc5200_pic 0 2 3
+ 0x8000 0 0 IRQ_INTD &mpc5200_pic 0 1 3
>;
ranges = <0x42000000 0 0x60000000 0x60000000 0 0x10000000
0x02000000 0 0x90000000 0x90000000 0 0x10000000
diff --git a/arch/powerpc/boot/dts/mvme5100.dts b/arch/powerpc/boot/dts/mvme5100.dts
index a7eb6d25903d..29c56e56e50a 100644
--- a/arch/powerpc/boot/dts/mvme5100.dts
+++ b/arch/powerpc/boot/dts/mvme5100.dts
@@ -10,6 +10,8 @@
/dts-v1/;
+#include <dt-bindings/interrupt-controller/irq.h>
+
/ {
model = "MVME5100";
compatible = "MVME5100";
@@ -96,7 +98,7 @@
bus-range = <0 255>;
clock-frequency = <33333333>;
interrupt-parent = <&mpic>;
- interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+ interrupt-map-mask = <0xf800 0x0 0x0 IRQ_INT_ALL>;
interrupt-map = <
/*
@@ -109,46 +111,46 @@
* "spurious" i8259 interrupts to be fielded.
*/
// IDSEL 11 - iPMC712 PCI/ISA Bridge
- 0x5800 0x0 0x0 0x1 &mpic 0x0 0x2
- 0x5800 0x0 0x0 0x2 &mpic 0x0 0x2
- 0x5800 0x0 0x0 0x3 &mpic 0x0 0x2
- 0x5800 0x0 0x0 0x4 &mpic 0x0 0x2
+ 0x5800 0x0 0x0 IRQ_INTA &mpic 0x0 0x2
+ 0x5800 0x0 0x0 IRQ_INTB &mpic 0x0 0x2
+ 0x5800 0x0 0x0 IRQ_INTC &mpic 0x0 0x2
+ 0x5800 0x0 0x0 IRQ_INTD &mpic 0x0 0x2
/* IDSEL 12 - Not Used */
/* IDSEL 13 - Universe VME Bridge */
- 0x6800 0x0 0x0 0x1 &mpic 0x5 0x1
- 0x6800 0x0 0x0 0x2 &mpic 0x6 0x1
- 0x6800 0x0 0x0 0x3 &mpic 0x7 0x1
- 0x6800 0x0 0x0 0x4 &mpic 0x8 0x1
+ 0x6800 0x0 0x0 IRQ_INTA &mpic 0x5 0x1
+ 0x6800 0x0 0x0 IRQ_INTB &mpic 0x6 0x1
+ 0x6800 0x0 0x0 IRQ_INTC &mpic 0x7 0x1
+ 0x6800 0x0 0x0 IRQ_INTD &mpic 0x8 0x1
/* IDSEL 14 - ENET 1 */
- 0x7000 0x0 0x0 0x1 &mpic 0x2 0x1
+ 0x7000 0x0 0x0 IRQ_INTA &mpic 0x2 0x1
/* IDSEL 15 - Not Used */
/* IDSEL 16 - PMC Slot 1 */
- 0x8000 0x0 0x0 0x1 &mpic 0x9 0x1
- 0x8000 0x0 0x0 0x2 &mpic 0xa 0x1
- 0x8000 0x0 0x0 0x3 &mpic 0xb 0x1
- 0x8000 0x0 0x0 0x4 &mpic 0xc 0x1
+ 0x8000 0x0 0x0 IRQ_INTA &mpic 0x9 0x1
+ 0x8000 0x0 0x0 IRQ_INTB &mpic 0xa 0x1
+ 0x8000 0x0 0x0 IRQ_INTC &mpic 0xb 0x1
+ 0x8000 0x0 0x0 IRQ_INTD &mpic 0xc 0x1
/* IDSEL 17 - PMC Slot 2 */
- 0x8800 0x0 0x0 0x1 &mpic 0xc 0x1
- 0x8800 0x0 0x0 0x2 &mpic 0x9 0x1
- 0x8800 0x0 0x0 0x3 &mpic 0xa 0x1
- 0x8800 0x0 0x0 0x4 &mpic 0xb 0x1
+ 0x8800 0x0 0x0 IRQ_INTA &mpic 0xc 0x1
+ 0x8800 0x0 0x0 IRQ_INTB &mpic 0x9 0x1
+ 0x8800 0x0 0x0 IRQ_INTC &mpic 0xa 0x1
+ 0x8800 0x0 0x0 IRQ_INTD &mpic 0xb 0x1
/* IDSEL 18 - Not Used */
/* IDSEL 19 - ENET 2 */
- 0x9800 0x0 0x0 0x1 &mpic 0xd 0x1
+ 0x9800 0x0 0x0 IRQ_INTA &mpic 0xd 0x1
/* IDSEL 20 - PMCSPAN (PCI-X) */
- 0xa000 0x0 0x0 0x1 &mpic 0x9 0x1
- 0xa000 0x0 0x0 0x2 &mpic 0xa 0x1
- 0xa000 0x0 0x0 0x3 &mpic 0xb 0x1
- 0xa000 0x0 0x0 0x4 &mpic 0xc 0x1
+ 0xa000 0x0 0x0 IRQ_INTA &mpic 0x9 0x1
+ 0xa000 0x0 0x0 IRQ_INTB &mpic 0xa 0x1
+ 0xa000 0x0 0x0 IRQ_INTC &mpic 0xb 0x1
+ 0xa000 0x0 0x0 IRQ_INTD &mpic 0xc 0x1
>;
diff --git a/arch/powerpc/boot/dts/pcm030.dts b/arch/powerpc/boot/dts/pcm030.dts
index b1bc731f7afd..d1a6b4deb258 100644
--- a/arch/powerpc/boot/dts/pcm030.dts
+++ b/arch/powerpc/boot/dts/pcm030.dts
@@ -10,6 +10,8 @@
/include/ "mpc5200b.dtsi"
+#include <dt-bindings/interrupt-controller/irq.h>
+
&gpt0 { fsl,has-wdt; };
&gpt2 { gpio-controller; };
&gpt3 { gpio-controller; };
@@ -80,16 +82,16 @@
};
pci@f0000d00 {
- interrupt-map-mask = <0xf800 0 0 7>;
- interrupt-map = <0xc000 0 0 1 &mpc5200_pic 0 0 3 // 1st slot
- 0xc000 0 0 2 &mpc5200_pic 1 1 3
- 0xc000 0 0 3 &mpc5200_pic 1 2 3
- 0xc000 0 0 4 &mpc5200_pic 1 3 3
-
- 0xc800 0 0 1 &mpc5200_pic 1 1 3 // 2nd slot
- 0xc800 0 0 2 &mpc5200_pic 1 2 3
- 0xc800 0 0 3 &mpc5200_pic 1 3 3
- 0xc800 0 0 4 &mpc5200_pic 0 0 3>;
+ interrupt-map-mask = <0xf800 0 0 IRQ_INT_ALL>;
+ interrupt-map = <0xc000 0 0 IRQ_INTA &mpc5200_pic 0 0 3 // 1st slot
+ 0xc000 0 0 IRQ_INTB &mpc5200_pic 1 1 3
+ 0xc000 0 0 IRQ_INTC &mpc5200_pic 1 2 3
+ 0xc000 0 0 IRQ_INTD &mpc5200_pic 1 3 3
+
+ 0xc800 0 0 IRQ_INTA &mpc5200_pic 1 1 3 // 2nd slot
+ 0xc800 0 0 IRQ_INTB &mpc5200_pic 1 2 3
+ 0xc800 0 0 IRQ_INTC &mpc5200_pic 1 3 3
+ 0xc800 0 0 IRQ_INTD &mpc5200_pic 0 0 3>;
ranges = <0x42000000 0 0x80000000 0x80000000 0 0x20000000
0x02000000 0 0xa0000000 0xa0000000 0 0x10000000
0x01000000 0 0x00000000 0xb0000000 0 0x01000000>;
diff --git a/arch/powerpc/boot/dts/pcm032.dts b/arch/powerpc/boot/dts/pcm032.dts
index c259c6b3ac5a..f60d45713469 100644
--- a/arch/powerpc/boot/dts/pcm032.dts
+++ b/arch/powerpc/boot/dts/pcm032.dts
@@ -10,6 +10,8 @@
/include/ "mpc5200b.dtsi"
+#include <dt-bindings/interrupt-controller/irq.h>
+
&gpt0 { fsl,has-wdt; };
&gpt2 { gpio-controller; };
&gpt3 { gpio-controller; };
@@ -79,16 +81,16 @@
};
pci@f0000d00 {
- interrupt-map-mask = <0xf800 0 0 7>;
- interrupt-map = <0xc000 0 0 1 &mpc5200_pic 0 0 3 // 1st slot
- 0xc000 0 0 2 &mpc5200_pic 1 1 3
- 0xc000 0 0 3 &mpc5200_pic 1 2 3
- 0xc000 0 0 4 &mpc5200_pic 1 3 3
-
- 0xc800 0 0 1 &mpc5200_pic 1 1 3 // 2nd slot
- 0xc800 0 0 2 &mpc5200_pic 1 2 3
- 0xc800 0 0 3 &mpc5200_pic 1 3 3
- 0xc800 0 0 4 &mpc5200_pic 0 0 3>;
+ interrupt-map-mask = <0xf800 0 0 IRQ_INT_ALL>;
+ interrupt-map = <0xc000 0 0 IRQ_INTA &mpc5200_pic 0 0 3 // 1st slot
+ 0xc000 0 0 IRQ_INTB &mpc5200_pic 1 1 3
+ 0xc000 0 0 IRQ_INTC &mpc5200_pic 1 2 3
+ 0xc000 0 0 IRQ_INTD &mpc5200_pic 1 3 3
+
+ 0xc800 0 0 IRQ_INTA &mpc5200_pic 1 1 3 // 2nd slot
+ 0xc800 0 0 IRQ_INTB &mpc5200_pic 1 2 3
+ 0xc800 0 0 IRQ_INTC &mpc5200_pic 1 3 3
+ 0xc800 0 0 IRQ_INTD &mpc5200_pic 0 0 3>;
ranges = <0x42000000 0 0x80000000 0x80000000 0 0x20000000
0x02000000 0 0xa0000000 0xa0000000 0 0x10000000
0x01000000 0 0x00000000 0xb0000000 0 0x01000000>;
diff --git a/arch/powerpc/boot/dts/pq2fads.dts b/arch/powerpc/boot/dts/pq2fads.dts
index b6666215ed63..35ba9f975981 100644
--- a/arch/powerpc/boot/dts/pq2fads.dts
+++ b/arch/powerpc/boot/dts/pq2fads.dts
@@ -7,6 +7,8 @@
/dts-v1/;
+#include <dt-bindings/interrupt-controller/irq.h>
+
/ {
model = "pq2fads";
compatible = "fsl,pq2fads";
@@ -83,25 +85,25 @@
#size-cells = <2>;
#address-cells = <3>;
clock-frequency = <66000000>;
- interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+ interrupt-map-mask = <0xf800 0x0 0x0 IRQ_INT_ALL>;
interrupt-map = <
/* IDSEL 0x16 */
- 0xb000 0x0 0x0 0x1 &PCI_PIC 0
- 0xb000 0x0 0x0 0x2 &PCI_PIC 1
- 0xb000 0x0 0x0 0x3 &PCI_PIC 2
- 0xb000 0x0 0x0 0x4 &PCI_PIC 3
+ 0xb000 0x0 0x0 IRQ_INTA &PCI_PIC 0
+ 0xb000 0x0 0x0 IRQ_INTB &PCI_PIC 1
+ 0xb000 0x0 0x0 IRQ_INTC &PCI_PIC 2
+ 0xb000 0x0 0x0 IRQ_INTD &PCI_PIC 3
/* IDSEL 0x17 */
- 0xb800 0x0 0x0 0x1 &PCI_PIC 4
- 0xb800 0x0 0x0 0x2 &PCI_PIC 5
- 0xb800 0x0 0x0 0x3 &PCI_PIC 6
- 0xb800 0x0 0x0 0x4 &PCI_PIC 7
+ 0xb800 0x0 0x0 IRQ_INTA &PCI_PIC 4
+ 0xb800 0x0 0x0 IRQ_INTB &PCI_PIC 5
+ 0xb800 0x0 0x0 IRQ_INTC &PCI_PIC 6
+ 0xb800 0x0 0x0 IRQ_INTD &PCI_PIC 7
/* IDSEL 0x18 */
- 0xc000 0x0 0x0 0x1 &PCI_PIC 8
- 0xc000 0x0 0x0 0x2 &PCI_PIC 9
- 0xc000 0x0 0x0 0x3 &PCI_PIC 10
- 0xc000 0x0 0x0 0x4 &PCI_PIC 11>;
+ 0xc000 0x0 0x0 IRQ_INTA &PCI_PIC 8
+ 0xc000 0x0 0x0 IRQ_INTB &PCI_PIC 9
+ 0xc000 0x0 0x0 IRQ_INTC &PCI_PIC 10
+ 0xc000 0x0 0x0 IRQ_INTD &PCI_PIC 11>;
interrupt-parent = <&PIC>;
interrupts = <18 8>;
diff --git a/arch/powerpc/boot/dts/socrates.dts b/arch/powerpc/boot/dts/socrates.dts
index 00a56e8e367c..f4e529bb9118 100644
--- a/arch/powerpc/boot/dts/socrates.dts
+++ b/arch/powerpc/boot/dts/socrates.dts
@@ -8,6 +8,8 @@
/dts-v1/;
+#include <dt-bindings/interrupt-controller/irq.h>
+
/ {
model = "abb,socrates";
compatible = "abb,socrates";
@@ -332,12 +334,12 @@
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 0x11 */
- 0x8800 0x0 0x0 1 &mpic 5 1
+ 0x8800 0x0 0x0 IRQ_INTA &mpic 5 1
/* IDSEL 0x12 */
- 0x9000 0x0 0x0 1 &mpic 4 1>;
+ 0x9000 0x0 0x0 IRQ_INTA &mpic 4 1>;
interrupt-parent = <&mpic>;
interrupts = <24 2>;
bus-range = <0x0 0x0>;
diff --git a/arch/powerpc/boot/dts/storcenter.dts b/arch/powerpc/boot/dts/storcenter.dts
index 99f6f544dc5f..e42c57a0a375 100644
--- a/arch/powerpc/boot/dts/storcenter.dts
+++ b/arch/powerpc/boot/dts/storcenter.dts
@@ -13,6 +13,8 @@
/dts-v1/;
+#include <dt-bindings/interrupt-controller/irq.h>
+
/ {
model = "StorCenter";
compatible = "iomega,storcenter";
@@ -116,23 +118,23 @@
bus-range = <0 0xff>;
clock-frequency = <97553800>;
interrupt-parent = <&mpic>;
- interrupt-map-mask = <0xf800 0 0 7>;
+ interrupt-map-mask = <0xf800 0 0 IRQ_INT_ALL>;
interrupt-map = <
/* IDSEL 13 - IDE */
- 0x6800 0 0 1 &mpic 0 1
- 0x6800 0 0 2 &mpic 0 1
- 0x6800 0 0 3 &mpic 0 1
- 0x6800 0 0 4 &mpic 0 1
+ 0x6800 0 0 IRQ_INTA &mpic 0 1
+ 0x6800 0 0 IRQ_INTB &mpic 0 1
+ 0x6800 0 0 IRQ_INTC &mpic 0 1
+ 0x6800 0 0 IRQ_INTD &mpic 0 1
/* IDSEL 14 - USB */
- 0x7000 0 0 1 &mpic 0 1
- 0x7000 0 0 2 &mpic 0 1
- 0x7000 0 0 3 &mpic 0 1
- 0x7000 0 0 4 &mpic 0 1
+ 0x7000 0 0 IRQ_INTA &mpic 0 1
+ 0x7000 0 0 IRQ_INTB &mpic 0 1
+ 0x7000 0 0 IRQ_INTC &mpic 0 1
+ 0x7000 0 0 IRQ_INTD &mpic 0 1
/* IDSEL 15 - ETH */
- 0x7800 0 0 1 &mpic 0 1
- 0x7800 0 0 2 &mpic 0 1
- 0x7800 0 0 3 &mpic 0 1
- 0x7800 0 0 4 &mpic 0 1
+ 0x7800 0 0 IRQ_INTA &mpic 0 1
+ 0x7800 0 0 IRQ_INTB &mpic 0 1
+ 0x7800 0 0 IRQ_INTC &mpic 0 1
+ 0x7800 0 0 IRQ_INTD &mpic 0 1
>;
};
diff --git a/arch/powerpc/boot/dts/stx_gp3_8560.dts b/arch/powerpc/boot/dts/stx_gp3_8560.dts
index d1ab698eef36..78c92101fbf6 100644
--- a/arch/powerpc/boot/dts/stx_gp3_8560.dts
+++ b/arch/powerpc/boot/dts/stx_gp3_8560.dts
@@ -7,6 +7,8 @@
/dts-v1/;
+#include <dt-bindings/interrupt-controller/irq.h>
+
/ {
model = "stx,gp3";
compatible = "stx,gp3-8560", "stx,gp3";
@@ -257,32 +259,32 @@
};
pci0: pci@fdf08000 {
- interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+ interrupt-map-mask = <0xf800 0x0 0x0 IRQ_INT_ALL>;
interrupt-map = <
/* IDSEL 0x0c */
- 0x6000 0 0 1 &mpic 1 1
- 0x6000 0 0 2 &mpic 2 1
- 0x6000 0 0 3 &mpic 3 1
- 0x6000 0 0 4 &mpic 4 1
+ 0x6000 0 0 IRQ_INTA &mpic 1 1
+ 0x6000 0 0 IRQ_INTB &mpic 2 1
+ 0x6000 0 0 IRQ_INTC &mpic 3 1
+ 0x6000 0 0 IRQ_INTD &mpic 4 1
/* IDSEL 0x0d */
- 0x6800 0 0 1 &mpic 4 1
- 0x6800 0 0 2 &mpic 1 1
- 0x6800 0 0 3 &mpic 2 1
- 0x6800 0 0 4 &mpic 3 1
+ 0x6800 0 0 IRQ_INTA &mpic 4 1
+ 0x6800 0 0 IRQ_INTB &mpic 1 1
+ 0x6800 0 0 IRQ_INTC &mpic 2 1
+ 0x6800 0 0 IRQ_INTD &mpic 3 1
/* IDSEL 0x0e */
- 0x7000 0 0 1 &mpic 3 1
- 0x7000 0 0 2 &mpic 4 1
- 0x7000 0 0 3 &mpic 1 1
- 0x7000 0 0 4 &mpic 2 1
+ 0x7000 0 0 IRQ_INTA &mpic 3 1
+ 0x7000 0 0 IRQ_INTB &mpic 4 1
+ 0x7000 0 0 IRQ_INTC &mpic 1 1
+ 0x7000 0 0 IRQ_INTD &mpic 2 1
/* IDSEL 0x0f */
- 0x7800 0 0 1 &mpic 2 1
- 0x7800 0 0 2 &mpic 3 1
- 0x7800 0 0 3 &mpic 4 1
- 0x7800 0 0 4 &mpic 1 1>;
+ 0x7800 0 0 IRQ_INTA &mpic 2 1
+ 0x7800 0 0 IRQ_INTB &mpic 3 1
+ 0x7800 0 0 IRQ_INTC &mpic 4 1
+ 0x7800 0 0 IRQ_INTD &mpic 1 1>;
interrupt-parent = <&mpic>;
interrupts = <24 2>;
diff --git a/arch/powerpc/boot/dts/taishan.dts b/arch/powerpc/boot/dts/taishan.dts
index 803f1bff7fa8..8d6ee99c1507 100644
--- a/arch/powerpc/boot/dts/taishan.dts
+++ b/arch/powerpc/boot/dts/taishan.dts
@@ -12,6 +12,8 @@
/dts-v1/;
+#include <dt-bindings/interrupt-controller/irq.h>
+
/ {
#address-cells = <2>;
#size-cells = <1>;
@@ -404,19 +406,19 @@
/* Inbound 2GB range starting at 0 */
dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>;
- interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+ interrupt-map-mask = <0xf800 0x0 0x0 IRQ_INT_ALL>;
interrupt-map = <
/* IDSEL 1 */
- 0x800 0x0 0x0 0x1 &UIC0 0x17 0x8
- 0x800 0x0 0x0 0x2 &UIC0 0x18 0x8
- 0x800 0x0 0x0 0x3 &UIC0 0x19 0x8
- 0x800 0x0 0x0 0x4 &UIC0 0x1a 0x8
+ 0x800 0x0 0x0 IRQ_INTA &UIC0 0x17 0x8
+ 0x800 0x0 0x0 IRQ_INTB &UIC0 0x18 0x8
+ 0x800 0x0 0x0 IRQ_INTC &UIC0 0x19 0x8
+ 0x800 0x0 0x0 IRQ_INTD &UIC0 0x1a 0x8
/* IDSEL 2 */
- 0x1000 0x0 0x0 0x1 &UIC0 0x18 0x8
- 0x1000 0x0 0x0 0x2 &UIC0 0x19 0x8
- 0x1000 0x0 0x0 0x3 &UIC0 0x1a 0x8
- 0x1000 0x0 0x0 0x4 &UIC0 0x17 0x8
+ 0x1000 0x0 0x0 IRQ_INTA &UIC0 0x18 0x8
+ 0x1000 0x0 0x0 IRQ_INTB &UIC0 0x19 0x8
+ 0x1000 0x0 0x0 IRQ_INTC &UIC0 0x1a 0x8
+ 0x1000 0x0 0x0 IRQ_INTD &UIC0 0x17 0x8
>;
};
};
diff --git a/arch/powerpc/boot/dts/tqm5200.dts b/arch/powerpc/boot/dts/tqm5200.dts
index 9ed0bc78967e..37db22b31e53 100644
--- a/arch/powerpc/boot/dts/tqm5200.dts
+++ b/arch/powerpc/boot/dts/tqm5200.dts
@@ -8,6 +8,8 @@
/dts-v1/;
+#include <dt-bindings/interrupt-controller/irq.h>
+
/ {
model = "tqc,tqm5200";
compatible = "tqc,tqm5200";
@@ -192,11 +194,11 @@
device_type = "pci";
compatible = "fsl,mpc5200-pci";
reg = <0xf0000d00 0x100>;
- interrupt-map-mask = <0xf800 0 0 7>;
- interrupt-map = <0xc000 0 0 1 &mpc5200_pic 0 0 3
- 0xc000 0 0 2 &mpc5200_pic 0 0 3
- 0xc000 0 0 3 &mpc5200_pic 0 0 3
- 0xc000 0 0 4 &mpc5200_pic 0 0 3>;
+ interrupt-map-mask = <0xf800 0 0 IRQ_INT_ALL>;
+ interrupt-map = <0xc000 0 0 IRQ_INTA &mpc5200_pic 0 0 3
+ 0xc000 0 0 IRQ_INTB &mpc5200_pic 0 0 3
+ 0xc000 0 0 IRQ_INTC &mpc5200_pic 0 0 3
+ 0xc000 0 0 IRQ_INTD &mpc5200_pic 0 0 3>;
clock-frequency = <0>; // From boot loader
interrupts = <2 8 0 2 9 0 2 10 0>;
bus-range = <0 0>;
diff --git a/arch/powerpc/boot/dts/tqm8540.dts b/arch/powerpc/boot/dts/tqm8540.dts
index 9c1eb9779108..d83dd9420da0 100644
--- a/arch/powerpc/boot/dts/tqm8540.dts
+++ b/arch/powerpc/boot/dts/tqm8540.dts
@@ -7,6 +7,8 @@
/dts-v1/;
+#include <dt-bindings/interrupt-controller/irq.h>
+
/ {
model = "tqc,tqm8540";
compatible = "tqc,tqm8540";
@@ -320,17 +322,17 @@
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 28 */
- 0xe000 0 0 1 &mpic 2 1
- 0xe000 0 0 2 &mpic 3 1
- 0xe000 0 0 3 &mpic 6 1
- 0xe000 0 0 4 &mpic 5 1
+ 0xe000 0 0 IRQ_INTA &mpic 2 1
+ 0xe000 0 0 IRQ_INTB &mpic 3 1
+ 0xe000 0 0 IRQ_INTC &mpic 6 1
+ 0xe000 0 0 IRQ_INTD &mpic 5 1
/* IDSEL 11 */
- 0x5800 0 0 1 &mpic 6 1
- 0x5800 0 0 2 &mpic 5 1
+ 0x5800 0 0 IRQ_INTA &mpic 6 1
+ 0x5800 0 0 IRQ_INTB &mpic 5 1
>;
interrupt-parent = <&mpic>;
diff --git a/arch/powerpc/boot/dts/tqm8541.dts b/arch/powerpc/boot/dts/tqm8541.dts
index 44595cf675d0..a8b2a3fd99f7 100644
--- a/arch/powerpc/boot/dts/tqm8541.dts
+++ b/arch/powerpc/boot/dts/tqm8541.dts
@@ -7,6 +7,8 @@
/dts-v1/;
+#include <dt-bindings/interrupt-controller/irq.h>
+
/ {
model = "tqc,tqm8541";
compatible = "tqc,tqm8541";
@@ -300,17 +302,17 @@
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 28 */
- 0xe000 0 0 1 &mpic 2 1
- 0xe000 0 0 2 &mpic 3 1
- 0xe000 0 0 3 &mpic 6 1
- 0xe000 0 0 4 &mpic 5 1
+ 0xe000 0 0 IRQ_INTA &mpic 2 1
+ 0xe000 0 0 IRQ_INTB &mpic 3 1
+ 0xe000 0 0 IRQ_INTC &mpic 6 1
+ 0xe000 0 0 IRQ_INTD &mpic 5 1
/* IDSEL 11 */
- 0x5800 0 0 1 &mpic 6 1
- 0x5800 0 0 2 &mpic 5 1
+ 0x5800 0 0 IRQ_INTA &mpic 6 1
+ 0x5800 0 0 IRQ_INTB &mpic 5 1
>;
interrupt-parent = <&mpic>;
diff --git a/arch/powerpc/boot/dts/tqm8555.dts b/arch/powerpc/boot/dts/tqm8555.dts
index 54f3e82907d6..8d5bf40d1871 100644
--- a/arch/powerpc/boot/dts/tqm8555.dts
+++ b/arch/powerpc/boot/dts/tqm8555.dts
@@ -7,6 +7,8 @@
/dts-v1/;
+#include <dt-bindings/interrupt-controller/irq.h>
+
/ {
model = "tqc,tqm8555";
compatible = "tqc,tqm8555";
@@ -300,17 +302,17 @@
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 28 */
- 0xe000 0 0 1 &mpic 2 1
- 0xe000 0 0 2 &mpic 3 1
- 0xe000 0 0 3 &mpic 6 1
- 0xe000 0 0 4 &mpic 5 1
+ 0xe000 0 0 IRQ_INTA &mpic 2 1
+ 0xe000 0 0 IRQ_INTB &mpic 3 1
+ 0xe000 0 0 IRQ_INTC &mpic 6 1
+ 0xe000 0 0 IRQ_INTD &mpic 5 1
/* IDSEL 11 */
- 0x5800 0 0 1 &mpic 6 1
- 0x5800 0 0 2 &mpic 5 1
+ 0x5800 0 0 IRQ_INTA &mpic 6 1
+ 0x5800 0 0 IRQ_INTB &mpic 5 1
>;
interrupt-parent = <&mpic>;
diff --git a/arch/powerpc/boot/dts/tqm8560.dts b/arch/powerpc/boot/dts/tqm8560.dts
index 7415cb69f60d..ec113cbf7a0f 100644
--- a/arch/powerpc/boot/dts/tqm8560.dts
+++ b/arch/powerpc/boot/dts/tqm8560.dts
@@ -8,6 +8,8 @@
/dts-v1/;
+#include <dt-bindings/interrupt-controller/irq.h>
+
/ {
model = "tqc,tqm8560";
compatible = "tqc,tqm8560";
@@ -373,17 +375,17 @@
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 28 */
- 0xe000 0 0 1 &mpic 2 1
- 0xe000 0 0 2 &mpic 3 1
- 0xe000 0 0 3 &mpic 6 1
- 0xe000 0 0 4 &mpic 5 1
+ 0xe000 0 0 IRQ_INTA &mpic 2 1
+ 0xe000 0 0 IRQ_INTB &mpic 3 1
+ 0xe000 0 0 IRQ_INTC &mpic 6 1
+ 0xe000 0 0 IRQ_INTD &mpic 5 1
/* IDSEL 11 */
- 0x5800 0 0 1 &mpic 6 1
- 0x5800 0 0 2 &mpic 5 1
+ 0x5800 0 0 IRQ_INTA &mpic 6 1
+ 0x5800 0 0 IRQ_INTB &mpic 5 1
>;
interrupt-parent = <&mpic>;
diff --git a/arch/powerpc/boot/dts/virtex440-ml510.dts b/arch/powerpc/boot/dts/virtex440-ml510.dts
index 3b736ca26ddc..4c2c63f199a2 100644
--- a/arch/powerpc/boot/dts/virtex440-ml510.dts
+++ b/arch/powerpc/boot/dts/virtex440-ml510.dts
@@ -11,6 +11,9 @@
*/
/dts-v1/;
+
+#include <dt-bindings/interrupt-controller/irq.h>
+
/ {
#address-cells = <1>;
#size-cells = <1>;
@@ -353,7 +356,7 @@
#interrupt-cells = <1>;
interrupt-parent = <&xps_intc_0>;
- interrupt-map-mask = <0xff00 0x0 0x0 0x7>;
+ interrupt-map-mask = <0xff00 0x0 0x0 IRQ_INT_ALL>;
interrupt-map = <
/* IRQ mapping for pci slots and ALI M1533
* periperhals. In total there are 5 interrupt
@@ -373,17 +376,17 @@
*/
/* IDSEL 0x16 / dev=6, bus=0 / PCI slot 3 */
- 0x3000 0 0 1 &xps_intc_0 3 2
- 0x3000 0 0 2 &xps_intc_0 2 2
- 0x3000 0 0 3 &xps_intc_0 5 2
- 0x3000 0 0 4 &xps_intc_0 4 2
+ 0x3000 0 0 IRQ_INTA &xps_intc_0 3 2
+ 0x3000 0 0 IRQ_INTB &xps_intc_0 2 2
+ 0x3000 0 0 IRQ_INTC &xps_intc_0 5 2
+ 0x3000 0 0 IRQ_INTD &xps_intc_0 4 2
/* IDSEL 0x13 / dev=3, bus=1 / PCI slot 4 */
/*
- 0x11800 0 0 1 &xps_intc_0 5 0 2
- 0x11800 0 0 2 &xps_intc_0 4 0 2
- 0x11800 0 0 3 &xps_intc_0 3 0 2
- 0x11800 0 0 4 &xps_intc_0 2 0 2
+ 0x11800 0 0 IRQ_INTA &xps_intc_0 5 0 2
+ 0x11800 0 0 IRQ_INTB &xps_intc_0 4 0 2
+ 0x11800 0 0 IRQ_INTC &xps_intc_0 3 0 2
+ 0x11800 0 0 IRQ_INTD &xps_intc_0 2 0 2
*/
/* According to the datasheet + schematic
@@ -394,29 +397,29 @@
* commented out.
*/
/* IDSEL 0x15 / dev=5, bus=0 / PCI slot 5 */
- 0x2800 0 0 1 &xps_intc_0 4 2
+ 0x2800 0 0 IRQ_INTA &xps_intc_0 4 2
/*
- 0x2800 0 0 2 &xps_intc_0 3 2
- 0x2800 0 0 3 &xps_intc_0 2 2
- 0x2800 0 0 4 &xps_intc_0 5 2
+ 0x2800 0 0 IRQ_INTB &xps_intc_0 3 2
+ 0x2800 0 0 IRQ_INTC &xps_intc_0 2 2
+ 0x2800 0 0 IRQ_INTD &xps_intc_0 5 2
*/
/* IDSEL 0x12 / dev=2, bus=1 / PCI slot 6 */
/*
- 0x11000 0 0 1 &xps_intc_0 4 0 2
- 0x11000 0 0 2 &xps_intc_0 3 0 2
- 0x11000 0 0 3 &xps_intc_0 2 0 2
- 0x11000 0 0 4 &xps_intc_0 5 0 2
+ 0x11000 0 0 IRQ_INTA &xps_intc_0 4 0 2
+ 0x11000 0 0 IRQ_INTB &xps_intc_0 3 0 2
+ 0x11000 0 0 IRQ_INTC &xps_intc_0 2 0 2
+ 0x11000 0 0 IRQ_INTD &xps_intc_0 5 0 2
*/
/* IDSEL 0x11 / dev=1, bus=0 / AC97 audio */
- 0x0800 0 0 1 &i8259 7 2
+ 0x0800 0 0 IRQ_INTA &i8259 7 2
/* IDSEL 0x1b / dev=11, bus=0 / IDE */
- 0x5800 0 0 1 &i8259 14 2
+ 0x5800 0 0 IRQ_INTA &i8259 14 2
/* IDSEL 0x1f / dev 15, bus=0 / 2x USB 1.1 */
- 0x7800 0 0 1 &i8259 7 2
+ 0x7800 0 0 IRQ_INTA &i8259 7 2
>;
ali_m1533 {
#size-cells = <1>;
diff --git a/arch/powerpc/boot/dts/xcalibur1501.dts b/arch/powerpc/boot/dts/xcalibur1501.dts
index 46c25bda9515..90730a4f195e 100644
--- a/arch/powerpc/boot/dts/xcalibur1501.dts
+++ b/arch/powerpc/boot/dts/xcalibur1501.dts
@@ -7,6 +7,9 @@
*/
/dts-v1/;
+
+#include <dt-bindings/interrupt-controller/irq.h>
+
/ {
model = "xes,xcalibur1501";
compatible = "xes,xcalibur1501", "xes,MPC8572";
@@ -668,13 +671,13 @@
clock-frequency = <33333333>;
interrupt-parent = <&mpic>;
interrupts = <26 2>;
- interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+ interrupt-map-mask = <0xf800 0x0 0x0 IRQ_INT_ALL>;
interrupt-map = <
/* IDSEL 0x0 */
- 0x0 0x0 0x0 0x1 &mpic 0x0 0x1
- 0x0 0x0 0x0 0x2 &mpic 0x1 0x1
- 0x0 0x0 0x0 0x3 &mpic 0x2 0x1
- 0x0 0x0 0x0 0x4 &mpic 0x3 0x1
+ 0x0 0x0 0x0 IRQ_INTA &mpic 0x0 0x1
+ 0x0 0x0 0x0 IRQ_INTB &mpic 0x1 0x1
+ 0x0 0x0 0x0 IRQ_INTC &mpic 0x2 0x1
+ 0x0 0x0 0x0 IRQ_INTD &mpic 0x3 0x1
>;
pcie@0 {
reg = <0x0 0x0 0x0 0x0 0x0>;
diff --git a/arch/powerpc/boot/dts/xpedite5200.dts b/arch/powerpc/boot/dts/xpedite5200.dts
index 840ea84bbb59..ea6d0e936faa 100644
--- a/arch/powerpc/boot/dts/xpedite5200.dts
+++ b/arch/powerpc/boot/dts/xpedite5200.dts
@@ -8,6 +8,8 @@
/dts-v1/;
+#include <dt-bindings/interrupt-controller/irq.h>
+
/ {
model = "xes,xpedite5200";
compatible = "xes,xpedite5200", "xes,MPC8548";
@@ -448,11 +450,11 @@
device_type = "pci";
reg = <0xef008000 0x1000>;
clock-frequency = <33333333>;
- interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+ interrupt-map-mask = <0xf800 0x0 0x0 IRQ_INT_ALL>;
interrupt-map = <
/* IDSEL */
- 0xe000 0 0 1 &mpic 2 1
- 0xe000 0 0 2 &mpic 3 1>;
+ 0xe000 0 0 IRQ_INTA &mpic 2 1
+ 0xe000 0 0 IRQ_INTB &mpic 3 1>;
interrupt-parent = <&mpic>;
interrupts = <24 2>;
--
2.21.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v1 5/7] powerpc: dts: fsl: Use IRQ flags for legacy PCI IRQ interrupts
2019-11-04 16:38 ` [PATCH v1 5/7] powerpc: dts: fsl: Use IRQ flags " Andrew Murray
@ 2019-11-12 12:48 ` Michael Ellerman
0 siblings, 0 replies; 5+ messages in thread
From: Michael Ellerman @ 2019-11-12 12:48 UTC (permalink / raw)
To: Andrew Murray, Rob Herring, Mark Rutland, Benjamin Herrenschmidt,
Paul Mackerras
Cc: devicetree, linuxppc-dev
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v1 6/7] powerpc: dts: Use IRQ flags for legacy PCI IRQ interrupts
2019-11-04 16:38 ` [PATCH v1 6/7] powerpc: dts: " Andrew Murray
@ 2019-11-12 12:48 ` Michael Ellerman
0 siblings, 0 replies; 5+ messages in thread
From: Michael Ellerman @ 2019-11-12 12:48 UTC (permalink / raw)
To: Andrew Murray, Rob Herring, Mark Rutland, Benjamin Herrenschmidt,
Paul Mackerras
Cc: devicetree, linuxppc-dev
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/bluestone.dts | 12 +++--
> arch/powerpc/boot/dts/charon.dts | 12 +++--
> arch/powerpc/boot/dts/digsy_mtc.dts | 12 +++--
> arch/powerpc/boot/dts/haleakala.dts | 12 +++--
> arch/powerpc/boot/dts/holly.dts | 42 ++++++++--------
> arch/powerpc/boot/dts/hotfoot.dts | 12 +++--
> arch/powerpc/boot/dts/kuroboxHD.dts | 28 ++++++-----
> arch/powerpc/boot/dts/kuroboxHG.dts | 28 ++++++-----
> arch/powerpc/boot/dts/lite5200.dts | 12 +++--
> arch/powerpc/boot/dts/lite5200b.dts | 22 +++++----
> arch/powerpc/boot/dts/media5200.dts | 26 +++++-----
> arch/powerpc/boot/dts/mpc5121ads.dts | 20 ++++----
> arch/powerpc/boot/dts/mpc8308rdb.dts | 12 +++--
> arch/powerpc/boot/dts/mpc8313erdb.dts | 20 ++++----
> arch/powerpc/boot/dts/mpc832x_mds.dts | 60 ++++++++++++-----------
> arch/powerpc/boot/dts/mpc832x_rdb.dts | 22 +++++----
> arch/powerpc/boot/dts/mpc8349emitxgp.dts | 8 +--
> arch/powerpc/boot/dts/mpc836x_mds.dts | 60 ++++++++++++-----------
> arch/powerpc/boot/dts/mpc836x_rdk.dts | 16 +++---
> arch/powerpc/boot/dts/mucmc52.dts | 12 +++--
> arch/powerpc/boot/dts/mvme5100.dts | 48 +++++++++---------
> arch/powerpc/boot/dts/pcm030.dts | 22 +++++----
> arch/powerpc/boot/dts/pcm032.dts | 22 +++++----
> arch/powerpc/boot/dts/pq2fads.dts | 28 ++++++-----
> arch/powerpc/boot/dts/socrates.dts | 8 +--
> arch/powerpc/boot/dts/storcenter.dts | 28 ++++++-----
> arch/powerpc/boot/dts/stx_gp3_8560.dts | 36 +++++++-------
> arch/powerpc/boot/dts/taishan.dts | 20 ++++----
> arch/powerpc/boot/dts/tqm5200.dts | 12 +++--
> arch/powerpc/boot/dts/tqm8540.dts | 16 +++---
> arch/powerpc/boot/dts/tqm8541.dts | 16 +++---
> arch/powerpc/boot/dts/tqm8555.dts | 16 +++---
> arch/powerpc/boot/dts/tqm8560.dts | 16 +++---
> arch/powerpc/boot/dts/virtex440-ml510.dts | 43 ++++++++--------
> arch/powerpc/boot/dts/xcalibur1501.dts | 13 +++--
> arch/powerpc/boot/dts/xpedite5200.dts | 8 +--
> 36 files changed, 437 insertions(+), 363 deletions(-)
Acked-by: Michael Ellerman <mpe@ellerman.id.au>
cheers
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-11-12 12:58 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-04 16:38 [PATCH v1 0/7] PCI: dt: Remove magic numbers for legacy PCI IRQ interrupts Andrew Murray
2019-11-04 16:38 ` [PATCH v1 5/7] powerpc: dts: fsl: Use IRQ flags " Andrew Murray
2019-11-12 12:48 ` Michael Ellerman
2019-11-04 16:38 ` [PATCH v1 6/7] powerpc: dts: " Andrew Murray
2019-11-12 12:48 ` Michael Ellerman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).