PCI: dt: Remove magic numbers for legacy PCI IRQ interrupts
Subsystems (21)
cover PCI: dt: Remove magic numbers for legacy PCI IRQ interrupts
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
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(-)
Signature · 1 line
2.21.0
PATCH 1/7 PCI: dt: Add legacy PCI IRQ defines
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 add a define for each type to improve device tree clarity.
--- include/dt-bindings/interrupt-controller/irq.h | 8 ++++++++ 1 file changed, 8 insertions(+)
include/dt-bindings/interrupt-controller/irq.h +8 -0
@@ -17,4 +17,12 @@#define IRQ_TYPE_LEVEL_HIGH 4#define IRQ_TYPE_LEVEL_LOW 8 +/* Legacy PCI IRQ lines */ +#define IRQ_INTA 1 +#define IRQ_INTB 2 +#define IRQ_INTC 3 +#define IRQ_INTD 4 + +#define IRQ_INT_ALL 7 +#endif
Signature · 1 line
2.21.0
Re: [PATCH v1 1/7] PCI: dt: Add legacy PCI IRQ defines
Quoted 10 lines · Andrew Murray
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 add a define for each type to improve device tree clarity.
Signed-off-by Andrew Murray <[email protected]>--- include/dt-bindings/interrupt-controller/irq.h | 8 ++++++++ 1 file changed, 8 insertions(+)
PATCH 2/7 arm64: dts: Use IRQ flags for legacy PCI IRQ interrupts
In reply to Andrew MurrayReplace magic numbers used to describe legacy PCI IRQ interrupts with #define.
--- arch/arm64/boot/dts/al/alpine-v2.dtsi | 6 +++--- arch/arm64/boot/dts/amd/amd-overdrive-rev-b0.dts | 2 +- arch/arm64/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 +++++----- arch/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 +++++----- arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 11 ++++++----- arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi | 11 ++++++----- arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 12 +++++++----- 18 files changed, 80 insertions(+), 72 deletions(-)
arch/arm64/boot/dts/al/alpine-v2.dtsi +3 -3
@@ -132,10 +132,10 @@ #address-cells = <3>; #interrupt-cells = <1>; reg = <0x0 0xfbc00000 0x0 0x100000>; - interrupt-map-mask = <0xf800 0 0 7>; + interrupt-map-mask = <0xf800 0 0 IRQ_INT_ALL>; /* add legacy interrupts for SATA only */ - interrupt-map = <0x4000 0 0 1 &gic 0 53 4>, - <0x4800 0 0 1 &gic 0 54 4>; + interrupt-map = <0x4000 0 0 IRQ_INTA &gic 0 53 4>, + <0x4800 0 0 IRQ_INTA &gic 0 54 4>; /* 32 bit non prefetchable memory space */ ranges = <0x2000000 0x0 0xfe000000 0x0 0xfe000000 0x0 0x1000000>; bus-range = <0x00 0x00>;
arch/arm64/boot/dts/amd/amd-overdrive-rev-b0.dts +1 -1
@@ -8,7 +8,7 @@ /dts-v1/; -/include/ "amd-seattle-soc.dtsi" +#include "amd-seattle-soc.dtsi" / { model = "AMD Seattle (Rev.B0) Development Board (Overdrive)";
arch/arm64/boot/dts/amd/amd-overdrive-rev-b1.dts +1 -1
@@ -8,7 +8,7 @@ /dts-v1/; -/include/ "amd-seattle-soc.dtsi" +#include "amd-seattle-soc.dtsi" / { model = "AMD Seattle (Rev.B1) Development Board (Overdrive)";
arch/arm64/boot/dts/amd/amd-overdrive.dts +1 -1
@@ -7,7 +7,7 @@ /dts-v1/; -/include/ "amd-seattle-soc.dtsi" +#include "amd-seattle-soc.dtsi" / { model = "AMD Seattle Development Board (Overdrive)";
arch/arm64/boot/dts/amd/amd-seattle-soc.dtsi +7 -5
@@ -5,6 +5,8 @@ * Copyright (C) 2014 Advanced Micro Devices, Inc. */ +#include <dt-bindings/interrupt-controller/irq.h> + / { compatible = "amd,seattle"; interrupt-parent = <&gic0>;
@@ -213,12 +215,12 @@ msi-parent = <&v2m0>; reg = <0 0xf0000000 0 0x10000000>; - interrupt-map-mask = <0xf800 0x0 0x0 0x7>; + interrupt-map-mask = <0xf800 0x0 0x0 IRQ_INT_ALL>; interrupt-map = - <0x1000 0x0 0x0 0x1 &gic0 0x0 0x0 0x0 0x120 0x1>, - <0x1000 0x0 0x0 0x2 &gic0 0x0 0x0 0x0 0x121 0x1>, - <0x1000 0x0 0x0 0x3 &gic0 0x0 0x0 0x0 0x122 0x1>, - <0x1000 0x0 0x0 0x4 &gic0 0x0 0x0 0x0 0x123 0x1>; + <0x1000 0x0 0x0 IRQ_INTA &gic0 0x0 0x0 0x0 0x120 0x1>, + <0x1000 0x0 0x0 IRQ_INTB &gic0 0x0 0x0 0x0 0x121 0x1>, + <0x1000 0x0 0x0 IRQ_INTC &gic0 0x0 0x0 0x0 0x122 0x1>, + <0x1000 0x0 0x0 IRQ_INTD &gic0 0x0 0x0 0x0 0x123 0x1>; dma-coherent; dma-ranges = <0x43000000 0x0 0x0 0x0 0x0 0x100 0x0>;
arch/arm64/boot/dts/amd/husky.dts +1 -1
@@ -8,7 +8,7 @@ /dts-v1/; -/include/ "amd-seattle-soc.dtsi" +#include "amd-seattle-soc.dtsi" / { model = "Linaro 96Boards Enterprise Edition Server (Husky) Board";
arch/arm64/boot/dts/arm/fvp-base-revc.dts +5 -5
@@ -161,11 +161,11 @@ bus-range = <0x0 0x1>; reg = <0x0 0x40000000 0x0 0x10000000>; ranges = <0x2000000 0x0 0x50000000 0x0 0x50000000 0x0 0x10000000>; - interrupt-map = <0 0 0 1 &gic GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 2 &gic GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 3 &gic GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 4 &gic GIC_SPI 171 IRQ_TYPE_LEVEL_HIGH>; - interrupt-map-mask = <0x0 0x0 0x0 0x7>; + interrupt-map = <0 0 0 IRQ_INTA &gic GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTB &gic GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTC &gic GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTD &gic GIC_SPI 171 IRQ_TYPE_LEVEL_HIGH>; + interrupt-map-mask = <0x0 0x0 0x0 IRQ_INT_ALL>; msi-map = <0x0 &its 0x0 0x10000>; iommu-map = <0x0 &smmu 0x0 0x10000>;
arch/arm64/boot/dts/arm/juno-base.dtsi +7 -5
@@ -1,4 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 +#include <dt-bindings/interrupt-controller/irq.h> + #include "juno-clocks.dtsi" #include "juno-motherboard.dtsi"
@@ -519,11 +521,11 @@ <0x02000000 0x00 0x50000000 0x00 0x50000000 0x0 0x08000000>, <0x42000000 0x40 0x00000000 0x40 0x00000000 0x1 0x00000000>; #interrupt-cells = <1>; - interrupt-map-mask = <0 0 0 7>; - interrupt-map = <0 0 0 1 &gic 0 0 GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 2 &gic 0 0 GIC_SPI 137 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 3 &gic 0 0 GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 4 &gic 0 0 GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>; + interrupt-map-mask = <0 0 0 IRQ_INT_ALL>; + interrupt-map = <0 0 0 IRQ_INTA &gic 0 0 GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTB &gic 0 0 GIC_SPI 137 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTC &gic 0 0 GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTD &gic 0 0 GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>; msi-parent = <&v2m_0>; status = "disabled"; iommu-map-mask = <0x0>; /* RC has no means to output PCI RID */
arch/arm64/boot/dts/cavium/thunder2-99xx.dtsi +5 -5
@@ -115,13 +115,13 @@ <0x02000000 0 0x40000000 0 0x40000000 0 0x20000000 0x43000000 0x40 0x00000000 0x40 0x00000000 0x20 0x00000000>; bus-range = <0 0xff>; - interrupt-map-mask = <0 0 0 7>; + interrupt-map-mask = <0 0 0 IRQ_INT_ALL>; interrupt-map = /* addr pin ic icaddr icintr */ - <0 0 0 1 &gic 0 0 GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH - 0 0 0 2 &gic 0 0 GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH - 0 0 0 3 &gic 0 0 GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH - 0 0 0 4 &gic 0 0 GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>; + <0 0 0 IRQ_INTA &gic 0 0 GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH + 0 0 0 IRQ_INTB &gic 0 0 GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH + 0 0 0 IRQ_INTC &gic 0 0 GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH + 0 0 0 IRQ_INTD &gic 0 0 GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>; msi-parent = <&gicits>; dma-coherent; };
arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi +5 -5
@@ -492,11 +492,11 @@ 0x82000000 0x0 0x40000000 0x40 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */ msi-parent = <&msi>; #interrupt-cells = <1>; - interrupt-map-mask = <0 0 0 7>; - interrupt-map = <0000 0 0 1 &gic 0 110 IRQ_TYPE_LEVEL_HIGH>, - <0000 0 0 2 &gic 0 111 IRQ_TYPE_LEVEL_HIGH>, - <0000 0 0 3 &gic 0 112 IRQ_TYPE_LEVEL_HIGH>, - <0000 0 0 4 &gic 0 113 IRQ_TYPE_LEVEL_HIGH>; + interrupt-map-mask = <0 0 0 IRQ_INT_ALL>; + interrupt-map = <0000 0 0 IRQ_INTA &gic 0 110 IRQ_TYPE_LEVEL_HIGH>, + <0000 0 0 IRQ_INTB &gic 0 111 IRQ_TYPE_LEVEL_HIGH>, + <0000 0 0 IRQ_INTC &gic 0 112 IRQ_TYPE_LEVEL_HIGH>, + <0000 0 0 IRQ_INTD &gic 0 113 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; }; };
arch/arm64/boot/dts/hisilicon/hi3660.dtsi +5 -5
@@ -1013,14 +1013,14 @@ #interrupt-cells = <1>; interrupts = <0 283 4>; interrupt-names = "msi"; - interrupt-map-mask = <0xf800 0 0 7>; - interrupt-map = <0x0 0 0 1 + interrupt-map-mask = <0xf800 0 0 IRQ_INT_ALL>; + interrupt-map = <0x0 0 0 IRQ_INTA &gic GIC_SPI 282 IRQ_TYPE_LEVEL_HIGH>, - <0x0 0 0 2 + <0x0 0 0 IRQ_INTB &gic GIC_SPI 283 IRQ_TYPE_LEVEL_HIGH>, - <0x0 0 0 3 + <0x0 0 0 IRQ_INTC &gic GIC_SPI 284 IRQ_TYPE_LEVEL_HIGH>, - <0x0 0 0 4 + <0x0 0 0 IRQ_INTD &gic GIC_SPI 285 IRQ_TYPE_LEVEL_HIGH>; clocks = <&crg_ctrl HI3660_PCIEPHY_REF>, <&crg_ctrl HI3660_CLK_GATE_PCIEAUX>,
arch/arm64/boot/dts/hisilicon/hip06.dtsi +5 -5
@@ -741,11 +741,11 @@ 0x5ff0000 0x01000000 0 0 0 0xb7ff0000 0 0x10000>; #interrupt-cells = <1>; - interrupt-map-mask = <0xf800 0 0 7>; - interrupt-map = <0x0 0 0 1 &mbigen_pcie0 650 4 - 0x0 0 0 2 &mbigen_pcie0 650 4 - 0x0 0 0 3 &mbigen_pcie0 650 4 - 0x0 0 0 4 &mbigen_pcie0 650 4>; + interrupt-map-mask = <0xf800 0 0 IRQ_INT_ALL>; + interrupt-map = <0x0 0 0 IRQ_INTA &mbigen_pcie0 650 4 + 0x0 0 0 IRQ_INTB &mbigen_pcie0 650 4 + 0x0 0 0 IRQ_INTC &mbigen_pcie0 650 4 + 0x0 0 0 IRQ_INTD &mbigen_pcie0 650 4>; status = "disabled"; };
arch/arm64/boot/dts/qcom/msm8998.dtsi +5 -5
@@ -867,11 +867,11 @@ #interrupt-cells = <1>; interrupts = <GIC_SPI 405 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "msi"; - interrupt-map-mask = <0 0 0 0x7>; - interrupt-map = <0 0 0 1 &intc 0 135 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 2 &intc 0 136 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 3 &intc 0 138 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 4 &intc 0 139 IRQ_TYPE_LEVEL_HIGH>; + interrupt-map-mask = <0 0 0 IRQ_INT_ALL>; + interrupt-map = <0 0 0 IRQ_INTA &intc 0 135 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTB &intc 0 136 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTC &intc 0 138 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTD &intc 0 139 IRQ_TYPE_LEVEL_HIGH>; clocks = <&gcc GCC_PCIE_0_PIPE_CLK>, <&gcc GCC_PCIE_0_MSTR_AXI_CLK>,
arch/arm64/boot/dts/qcom/qcs404.dtsi +5 -5
@@ -980,11 +980,11 @@ interrupts = <GIC_SPI 266 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "msi"; #interrupt-cells = <1>; - interrupt-map-mask = <0 0 0 0x7>; - interrupt-map = <0 0 0 1 &intc GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>, /* int_a */ - <0 0 0 2 &intc GIC_SPI 224 IRQ_TYPE_LEVEL_HIGH>, /* int_b */ - <0 0 0 3 &intc GIC_SPI 267 IRQ_TYPE_LEVEL_HIGH>, /* int_c */ - <0 0 0 4 &intc GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>; /* int_d */ + interrupt-map-mask = <0 0 0 IRQ_INT_ALL>; + interrupt-map = <0 0 0 IRQ_INTA &intc GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTB &intc GIC_SPI 224 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTC &intc GIC_SPI 267 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTD &intc GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>; clocks = <&gcc GCC_PCIE_0_CFG_AHB_CLK>, <&gcc GCC_PCIE_0_AUX_CLK>, <&gcc GCC_PCIE_0_MSTR_AXI_CLK>,
arch/arm64/boot/dts/rockchip/rk3399.dtsi +5 -5
@@ -242,11 +242,11 @@ <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH 0>, <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH 0>; interrupt-names = "sys", "legacy", "client"; - interrupt-map-mask = <0 0 0 7>; - interrupt-map = <0 0 0 1 &pcie0_intc 0>, - <0 0 0 2 &pcie0_intc 1>, - <0 0 0 3 &pcie0_intc 2>, - <0 0 0 4 &pcie0_intc 3>; + interrupt-map-mask = <0 0 0 IRQ_INT_ALL>; + interrupt-map = <0 0 0 IRQ_INTA &pcie0_intc 0>, + <0 0 0 IRQ_INTB &pcie0_intc 1>, + <0 0 0 IRQ_INTC &pcie0_intc 2>, + <0 0 0 IRQ_INTD &pcie0_intc 3>; linux,pci-domain = <0>; max-link-speed = <1>; msi-map = <0x0 &its 0x0 0x1000>;
arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi +6 -5
@@ -7,6 +7,7 @@ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/uniphier-gpio.h> +#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/thermal/thermal.h> / {
@@ -900,11 +901,11 @@ #interrupt-cells = <1>; interrupt-names = "dma", "msi"; interrupts = <0 224 4>, <0 225 4>; - interrupt-map-mask = <0 0 0 7>; - interrupt-map = <0 0 0 1 &pcie_intc 0>, /* INTA */ - <0 0 0 2 &pcie_intc 1>, /* INTB */ - <0 0 0 3 &pcie_intc 2>, /* INTC */ - <0 0 0 4 &pcie_intc 3>; /* INTD */ + interrupt-map-mask = <0 0 0 IRQ_INT_ALL>; + interrupt-map = <0 0 0 IRQ_INTA &pcie_intc 0>, + <0 0 0 IRQ_INTB &pcie_intc 1>, + <0 0 0 IRQ_INTC &pcie_intc 2>, + <0 0 0 IRQ_INTD &pcie_intc 3>; phy-names = "pcie-phy"; phys = <&pcie_phy>;
arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi +6 -5
@@ -7,6 +7,7 @@ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/uniphier-gpio.h> +#include <dt-bindings/interrupt-controller/irq.h> / { compatible = "socionext,uniphier-pxs3";
@@ -758,11 +759,11 @@ #interrupt-cells = <1>; interrupt-names = "dma", "msi"; interrupts = <0 224 4>, <0 225 4>; - interrupt-map-mask = <0 0 0 7>; - interrupt-map = <0 0 0 1 &pcie_intc 0>, /* INTA */ - <0 0 0 2 &pcie_intc 1>, /* INTB */ - <0 0 0 3 &pcie_intc 2>, /* INTC */ - <0 0 0 4 &pcie_intc 3>; /* INTD */ + interrupt-map-mask = <0 0 0 IRQ_INT_ALL>; + interrupt-map = <0 0 0 IRQ_INTA &pcie_intc 0>, + <0 0 0 IRQ_INTB &pcie_intc 1>, + <0 0 0 IRQ_INTC &pcie_intc 2>, + <0 0 0 IRQ_INTD &pcie_intc 3>; phy-names = "pcie-phy"; phys = <&pcie_phy>;
arch/arm64/boot/dts/xilinx/zynqmp.dtsi +7 -5
@@ -12,6 +12,8 @@ * the License, or (at your option) any later version. */ +#include <dt-bindings/interrupt-controller/irq.h> + / { compatible = "xlnx,zynqmp"; #address-cells = <2>;
@@ -462,11 +464,11 @@ ranges = <0x02000000 0x00000000 0xe0000000 0x00000000 0xe0000000 0x00000000 0x10000000 /* non-prefetchable memory */ 0x43000000 0x00000006 0x00000000 0x00000006 0x00000000 0x00000002 0x00000000>;/* prefetchable memory */ bus-range = <0x00 0xff>; - interrupt-map-mask = <0x0 0x0 0x0 0x7>; - interrupt-map = <0x0 0x0 0x0 0x1 &pcie_intc 0x1>, - <0x0 0x0 0x0 0x2 &pcie_intc 0x2>, - <0x0 0x0 0x0 0x3 &pcie_intc 0x3>, - <0x0 0x0 0x0 0x4 &pcie_intc 0x4>; + interrupt-map-mask = <0x0 0x0 0x0 IRQ_INT_ALL>; + interrupt-map = <0x0 0x0 0x0 IRQ_INTA &pcie_intc 0x1>, + <0x0 0x0 0x0 IRQ_INTB &pcie_intc 0x2>, + <0x0 0x0 0x0 IRQ_INTC &pcie_intc 0x3>, + <0x0 0x0 0x0 IRQ_INTD &pcie_intc 0x4>; pcie_intc: legacy-interrupt-controller { interrupt-controller; #address-cells = <0>;
Signature · 1 line
2.21.0
Re: [PATCH v1 2/7] arm64: dts: Use IRQ flags for legacy PCI IRQ interrupts
Quoted 165 lines · Andrew Murray
Replace magic numbers used to describe legacy PCI IRQ interrupts with #define.
Signed-off-by Andrew Murray <[email protected]>--- arch/arm64/boot/dts/al/alpine-v2.dtsi | 6 +++--- arch/arm64/boot/dts/amd/amd-overdrive-rev-b0.dts | 2 +- arch/arm64/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 +++++----- arch/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 +++++----- arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 11 ++++++----- arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi | 11 ++++++----- arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 12 +++++++----- 18 files changed, 80 insertions(+), 72 deletions(-)arch/arm64/boot/dts/al/alpine-v2.dtsi +3
-3@@ -132,10 +132,10 @@ #address-cells = <3>; #interrupt-cells = <1>; reg = <0x0 0xfbc00000 0x0 0x100000>; - interrupt-map-mask = <0xf800 0 0 7>; + interrupt-map-mask = <0xf800 0 0 IRQ_INT_ALL>; /* add legacy interrupts for SATA only */ - interrupt-map = <0x4000 0 0 1 &gic 0 53 4>, - <0x4800 0 0 1 &gic 0 54 4>; + interrupt-map = <0x4000 0 0 IRQ_INTA &gic 0 53 4>, + <0x4800 0 0 IRQ_INTA &gic 0 54 4>; /* 32 bit non prefetchable memory space */ ranges = <0x2000000 0x0 0xfe000000 0x0 0xfe000000 0x0 0x1000000>; bus-range = <0x00 0x00>;arch/arm64/boot/dts/amd/amd-overdrive-rev-b0.dts +1
-1@@ -8,7 +8,7 @@ /dts-v1/; -/include/ "amd-seattle-soc.dtsi" +#include "amd-seattle-soc.dtsi" / { model = "AMD Seattle (Rev.B0) Development Board (Overdrive)";arch/arm64/boot/dts/amd/amd-overdrive-rev-b1.dts +1
-1@@ -8,7 +8,7 @@ /dts-v1/; -/include/ "amd-seattle-soc.dtsi" +#include "amd-seattle-soc.dtsi" / { model = "AMD Seattle (Rev.B1) Development Board (Overdrive)";arch/arm64/boot/dts/amd/amd-overdrive.dts +1
-1@@ -7,7 +7,7 @@ /dts-v1/; -/include/ "amd-seattle-soc.dtsi" +#include "amd-seattle-soc.dtsi" / { model = "AMD Seattle Development Board (Overdrive)";arch/arm64/boot/dts/amd/amd-seattle-soc.dtsi +7
-5@@ -5,6 +5,8 @@ * Copyright (C) 2014 Advanced Micro Devices, Inc. */ +#include <dt-bindings/interrupt-controller/irq.h> + / { compatible = "amd,seattle"; interrupt-parent = <&gic0>;@@ -213,12 +215,12 @@ msi-parent = <&v2m0>; reg = <0 0xf0000000 0 0x10000000>; - interrupt-map-mask = <0xf800 0x0 0x0 0x7>; + interrupt-map-mask = <0xf800 0x0 0x0 IRQ_INT_ALL>; interrupt-map = - <0x1000 0x0 0x0 0x1 &gic0 0x0 0x0 0x0 0x120 0x1>, - <0x1000 0x0 0x0 0x2 &gic0 0x0 0x0 0x0 0x121 0x1>, - <0x1000 0x0 0x0 0x3 &gic0 0x0 0x0 0x0 0x122 0x1>, - <0x1000 0x0 0x0 0x4 &gic0 0x0 0x0 0x0 0x123 0x1>; + <0x1000 0x0 0x0 IRQ_INTA &gic0 0x0 0x0 0x0 0x120 0x1>, + <0x1000 0x0 0x0 IRQ_INTB &gic0 0x0 0x0 0x0 0x121 0x1>, + <0x1000 0x0 0x0 IRQ_INTC &gic0 0x0 0x0 0x0 0x122 0x1>, + <0x1000 0x0 0x0 IRQ_INTD &gic0 0x0 0x0 0x0 0x123 0x1>; dma-coherent; dma-ranges = <0x43000000 0x0 0x0 0x0 0x0 0x100 0x0>;arch/arm64/boot/dts/amd/husky.dts +1
-1@@ -8,7 +8,7 @@ /dts-v1/; -/include/ "amd-seattle-soc.dtsi" +#include "amd-seattle-soc.dtsi" / { model = "Linaro 96Boards Enterprise Edition Server (Husky) Board";arch/arm64/boot/dts/arm/fvp-base-revc.dts +5
-5@@ -161,11 +161,11 @@ bus-range = <0x0 0x1>; reg = <0x0 0x40000000 0x0 0x10000000>; ranges = <0x2000000 0x0 0x50000000 0x0 0x50000000 0x0 0x10000000>; - interrupt-map = <0 0 0 1 &gic GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 2 &gic GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 3 &gic GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 4 &gic GIC_SPI 171 IRQ_TYPE_LEVEL_HIGH>; - interrupt-map-mask = <0x0 0x0 0x0 0x7>; + interrupt-map = <0 0 0 IRQ_INTA &gic GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTB &gic GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTC &gic GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTD &gic GIC_SPI 171 IRQ_TYPE_LEVEL_HIGH>; + interrupt-map-mask = <0x0 0x0 0x0 IRQ_INT_ALL>; msi-map = <0x0 &its 0x0 0x10000>; iommu-map = <0x0 &smmu 0x0 0x10000>;arch/arm64/boot/dts/arm/juno-base.dtsi +2
-3@@ -1,4 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 +#include <dt-bindings/interrupt-controller/irq.h> + #include "juno-clocks.dtsi" #include "juno-motherboard.dtsi"@@ -519,11 +521,11 @@ <0x02000000 0x00 0x50000000 0x00 0x50000000 0x0 0x08000000>, <0x42000000 0x40 0x00000000 0x40 0x00000000 0x1 0x00000000>; #interrupt-cells = <1>; - interrupt-map-mask = <0 0 0 7>; - interrupt-map = <0 0 0 1 &gic 0 0 GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 2 &gic 0 0 GIC_SPI 137 IRQ_TYPE_LEVEL_HIGH>,
arch/arm64/boot/dts/arm/juno-base.dtsi line 531
Quoted 10 lines
arch/arm64/boot/dts/arm/juno-base.dtsi +5
-2- <0 0 0 3 &gic 0 0 GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 4 &gic 0 0 GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>; + interrupt-map-mask = <0 0 0 IRQ_INT_ALL>; + interrupt-map = <0 0 0 IRQ_INTA &gic 0 0 GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTB &gic 0 0 GIC_SPI 137 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTC &gic 0 0 GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTD &gic 0 0 GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>; msi-parent = <&v2m_0>; status = "disabled"; iommu-map-mask = <0x0>; /* RC has no means to output PCI RID */
For the Juno and FVP changes:
Best regards,
Liviu
Quoted 243 lines
arch/arm64/boot/dts/cavium/thunder2-99xx.dtsi +5
-5@@ -115,13 +115,13 @@ <0x02000000 0 0x40000000 0 0x40000000 0 0x20000000 0x43000000 0x40 0x00000000 0x40 0x00000000 0x20 0x00000000>; bus-range = <0 0xff>; - interrupt-map-mask = <0 0 0 7>; + interrupt-map-mask = <0 0 0 IRQ_INT_ALL>; interrupt-map = /* addr pin ic icaddr icintr */ - <0 0 0 1 &gic 0 0 GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH - 0 0 0 2 &gic 0 0 GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH - 0 0 0 3 &gic 0 0 GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH - 0 0 0 4 &gic 0 0 GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>; + <0 0 0 IRQ_INTA &gic 0 0 GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH + 0 0 0 IRQ_INTB &gic 0 0 GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH + 0 0 0 IRQ_INTC &gic 0 0 GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH + 0 0 0 IRQ_INTD &gic 0 0 GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>; msi-parent = <&gicits>; dma-coherent; };arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi +5
-5@@ -492,11 +492,11 @@ 0x82000000 0x0 0x40000000 0x40 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */ msi-parent = <&msi>; #interrupt-cells = <1>; - interrupt-map-mask = <0 0 0 7>; - interrupt-map = <0000 0 0 1 &gic 0 110 IRQ_TYPE_LEVEL_HIGH>, - <0000 0 0 2 &gic 0 111 IRQ_TYPE_LEVEL_HIGH>, - <0000 0 0 3 &gic 0 112 IRQ_TYPE_LEVEL_HIGH>, - <0000 0 0 4 &gic 0 113 IRQ_TYPE_LEVEL_HIGH>; + interrupt-map-mask = <0 0 0 IRQ_INT_ALL>; + interrupt-map = <0000 0 0 IRQ_INTA &gic 0 110 IRQ_TYPE_LEVEL_HIGH>, + <0000 0 0 IRQ_INTB &gic 0 111 IRQ_TYPE_LEVEL_HIGH>, + <0000 0 0 IRQ_INTC &gic 0 112 IRQ_TYPE_LEVEL_HIGH>, + <0000 0 0 IRQ_INTD &gic 0 113 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; }; };arch/arm64/boot/dts/hisilicon/hi3660.dtsi +5
-5@@ -1013,14 +1013,14 @@ #interrupt-cells = <1>; interrupts = <0 283 4>; interrupt-names = "msi"; - interrupt-map-mask = <0xf800 0 0 7>; - interrupt-map = <0x0 0 0 1 + interrupt-map-mask = <0xf800 0 0 IRQ_INT_ALL>; + interrupt-map = <0x0 0 0 IRQ_INTA &gic GIC_SPI 282 IRQ_TYPE_LEVEL_HIGH>, - <0x0 0 0 2 + <0x0 0 0 IRQ_INTB &gic GIC_SPI 283 IRQ_TYPE_LEVEL_HIGH>, - <0x0 0 0 3 + <0x0 0 0 IRQ_INTC &gic GIC_SPI 284 IRQ_TYPE_LEVEL_HIGH>, - <0x0 0 0 4 + <0x0 0 0 IRQ_INTD &gic GIC_SPI 285 IRQ_TYPE_LEVEL_HIGH>; clocks = <&crg_ctrl HI3660_PCIEPHY_REF>, <&crg_ctrl HI3660_CLK_GATE_PCIEAUX>,arch/arm64/boot/dts/hisilicon/hip06.dtsi +5
-5@@ -741,11 +741,11 @@ 0x5ff0000 0x01000000 0 0 0 0xb7ff0000 0 0x10000>; #interrupt-cells = <1>; - interrupt-map-mask = <0xf800 0 0 7>; - interrupt-map = <0x0 0 0 1 &mbigen_pcie0 650 4 - 0x0 0 0 2 &mbigen_pcie0 650 4 - 0x0 0 0 3 &mbigen_pcie0 650 4 - 0x0 0 0 4 &mbigen_pcie0 650 4>; + interrupt-map-mask = <0xf800 0 0 IRQ_INT_ALL>; + interrupt-map = <0x0 0 0 IRQ_INTA &mbigen_pcie0 650 4 + 0x0 0 0 IRQ_INTB &mbigen_pcie0 650 4 + 0x0 0 0 IRQ_INTC &mbigen_pcie0 650 4 + 0x0 0 0 IRQ_INTD &mbigen_pcie0 650 4>; status = "disabled"; };arch/arm64/boot/dts/qcom/msm8998.dtsi +5
-5@@ -867,11 +867,11 @@ #interrupt-cells = <1>; interrupts = <GIC_SPI 405 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "msi"; - interrupt-map-mask = <0 0 0 0x7>; - interrupt-map = <0 0 0 1 &intc 0 135 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 2 &intc 0 136 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 3 &intc 0 138 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 4 &intc 0 139 IRQ_TYPE_LEVEL_HIGH>; + interrupt-map-mask = <0 0 0 IRQ_INT_ALL>; + interrupt-map = <0 0 0 IRQ_INTA &intc 0 135 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTB &intc 0 136 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTC &intc 0 138 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTD &intc 0 139 IRQ_TYPE_LEVEL_HIGH>; clocks = <&gcc GCC_PCIE_0_PIPE_CLK>, <&gcc GCC_PCIE_0_MSTR_AXI_CLK>,arch/arm64/boot/dts/qcom/qcs404.dtsi +5
-5@@ -980,11 +980,11 @@ interrupts = <GIC_SPI 266 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "msi"; #interrupt-cells = <1>; - interrupt-map-mask = <0 0 0 0x7>; - interrupt-map = <0 0 0 1 &intc GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>, /* int_a */ - <0 0 0 2 &intc GIC_SPI 224 IRQ_TYPE_LEVEL_HIGH>, /* int_b */ - <0 0 0 3 &intc GIC_SPI 267 IRQ_TYPE_LEVEL_HIGH>, /* int_c */ - <0 0 0 4 &intc GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>; /* int_d */ + interrupt-map-mask = <0 0 0 IRQ_INT_ALL>; + interrupt-map = <0 0 0 IRQ_INTA &intc GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTB &intc GIC_SPI 224 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTC &intc GIC_SPI 267 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTD &intc GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>; clocks = <&gcc GCC_PCIE_0_CFG_AHB_CLK>, <&gcc GCC_PCIE_0_AUX_CLK>, <&gcc GCC_PCIE_0_MSTR_AXI_CLK>,arch/arm64/boot/dts/rockchip/rk3399.dtsi +5
-5@@ -242,11 +242,11 @@ <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH 0>, <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH 0>; interrupt-names = "sys", "legacy", "client"; - interrupt-map-mask = <0 0 0 7>; - interrupt-map = <0 0 0 1 &pcie0_intc 0>, - <0 0 0 2 &pcie0_intc 1>, - <0 0 0 3 &pcie0_intc 2>, - <0 0 0 4 &pcie0_intc 3>; + interrupt-map-mask = <0 0 0 IRQ_INT_ALL>; + interrupt-map = <0 0 0 IRQ_INTA &pcie0_intc 0>, + <0 0 0 IRQ_INTB &pcie0_intc 1>, + <0 0 0 IRQ_INTC &pcie0_intc 2>, + <0 0 0 IRQ_INTD &pcie0_intc 3>; linux,pci-domain = <0>; max-link-speed = <1>; msi-map = <0x0 &its 0x0 0x1000>;arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi +6
-5@@ -7,6 +7,7 @@ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/uniphier-gpio.h> +#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/thermal/thermal.h> / {@@ -900,11 +901,11 @@ #interrupt-cells = <1>; interrupt-names = "dma", "msi"; interrupts = <0 224 4>, <0 225 4>; - interrupt-map-mask = <0 0 0 7>; - interrupt-map = <0 0 0 1 &pcie_intc 0>, /* INTA */ - <0 0 0 2 &pcie_intc 1>, /* INTB */ - <0 0 0 3 &pcie_intc 2>, /* INTC */ - <0 0 0 4 &pcie_intc 3>; /* INTD */ + interrupt-map-mask = <0 0 0 IRQ_INT_ALL>; + interrupt-map = <0 0 0 IRQ_INTA &pcie_intc 0>, + <0 0 0 IRQ_INTB &pcie_intc 1>, + <0 0 0 IRQ_INTC &pcie_intc 2>, + <0 0 0 IRQ_INTD &pcie_intc 3>; phy-names = "pcie-phy"; phys = <&pcie_phy>;arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi +6
-5@@ -7,6 +7,7 @@ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/uniphier-gpio.h> +#include <dt-bindings/interrupt-controller/irq.h> / { compatible = "socionext,uniphier-pxs3";@@ -758,11 +759,11 @@ #interrupt-cells = <1>; interrupt-names = "dma", "msi"; interrupts = <0 224 4>, <0 225 4>; - interrupt-map-mask = <0 0 0 7>; - interrupt-map = <0 0 0 1 &pcie_intc 0>, /* INTA */ - <0 0 0 2 &pcie_intc 1>, /* INTB */ - <0 0 0 3 &pcie_intc 2>, /* INTC */ - <0 0 0 4 &pcie_intc 3>; /* INTD */ + interrupt-map-mask = <0 0 0 IRQ_INT_ALL>; + interrupt-map = <0 0 0 IRQ_INTA &pcie_intc 0>, + <0 0 0 IRQ_INTB &pcie_intc 1>, + <0 0 0 IRQ_INTC &pcie_intc 2>, + <0 0 0 IRQ_INTD &pcie_intc 3>; phy-names = "pcie-phy"; phys = <&pcie_phy>;arch/arm64/boot/dts/xilinx/zynqmp.dtsi +7
-5@@ -12,6 +12,8 @@ * the License, or (at your option) any later version. */ +#include <dt-bindings/interrupt-controller/irq.h> + / { compatible = "xlnx,zynqmp"; #address-cells = <2>;@@ -462,11 +464,11 @@ ranges = <0x02000000 0x00000000 0xe0000000 0x00000000 0xe0000000 0x00000000 0x10000000 /* non-prefetchable memory */ 0x43000000 0x00000006 0x00000000 0x00000006 0x00000000 0x00000002 0x00000000>;/* prefetchable memory */ bus-range = <0x00 0xff>; - interrupt-map-mask = <0x0 0x0 0x0 0x7>; - interrupt-map = <0x0 0x0 0x0 0x1 &pcie_intc 0x1>, - <0x0 0x0 0x0 0x2 &pcie_intc 0x2>, - <0x0 0x0 0x0 0x3 &pcie_intc 0x3>, - <0x0 0x0 0x0 0x4 &pcie_intc 0x4>; + interrupt-map-mask = <0x0 0x0 0x0 IRQ_INT_ALL>; + interrupt-map = <0x0 0x0 0x0 IRQ_INTA &pcie_intc 0x1>, + <0x0 0x0 0x0 IRQ_INTB &pcie_intc 0x2>, + <0x0 0x0 0x0 IRQ_INTC &pcie_intc 0x3>, + <0x0 0x0 0x0 IRQ_INTD &pcie_intc 0x4>; pcie_intc: legacy-interrupt-controller { interrupt-controller; #address-cells = <0>;Signature · 1 line
2.21.0
Signature · 13 lines
====================
| I would like to |
| fix the world, |
| but they're not |
| giving me the |
\ source code! /
---------------
¯\_(ツ)_/¯
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernelRe: [PATCH v1 2/7] arm64: dts: Use IRQ flags for legacy PCI IRQ interrupts
In reply to Andrew MurrayAm Montag, 4. November 2019, 17:38:16 CET schrieb Andrew Murray:
Quoted 16 lines
Replace magic numbers used to describe legacy PCI IRQ interrupts with #define.
Signed-off-by Andrew Murray <[email protected]>arch/arm64/boot/dts/rockchip/rk3399.dtsi +0
-3@@ -242,11 +242,11 @@ <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH 0>, <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH 0>; interrupt-names = "sys", "legacy", "client"; - interrupt-map-mask = <0 0 0 7>; - interrupt-map = <0 0 0 1 &pcie0_intc 0>, - <0 0 0 2 &pcie0_intc 1>,
arch/arm64/boot/dts/rockchip/rk3399.dtsi line 252
Quoted 10 lines
arch/arm64/boot/dts/rockchip/rk3399.dtsi +5
-2- <0 0 0 3 &pcie0_intc 2>, - <0 0 0 4 &pcie0_intc 3>; + interrupt-map-mask = <0 0 0 IRQ_INT_ALL>; + interrupt-map = <0 0 0 IRQ_INTA &pcie0_intc 0>, + <0 0 0 IRQ_INTB &pcie0_intc 1>, + <0 0 0 IRQ_INTC &pcie0_intc 2>, + <0 0 0 IRQ_INTD &pcie0_intc 3>; linux,pci-domain = <0>; max-link-speed = <1>; msi-map = <0x0 &its 0x0 0x1000>;
For the Rockchip part
Re: [PATCH v1 2/7] arm64: dts: Use IRQ flags for legacy PCI IRQ interrupts
In reply to Andrew MurrayQuoted 254 lines · Andrew Murray
Replace magic numbers used to describe legacy PCI IRQ interrupts with #define.
Signed-off-by Andrew Murray <[email protected]>--- arch/arm64/boot/dts/al/alpine-v2.dtsi | 6 +++--- arch/arm64/boot/dts/amd/amd-overdrive-rev-b0.dts | 2 +- arch/arm64/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 +++++----- arch/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 +++++----- arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 11 ++++++----- arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi | 11 ++++++----- arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 12 +++++++----- 18 files changed, 80 insertions(+), 72 deletions(-)arch/arm64/boot/dts/al/alpine-v2.dtsi +3
-3@@ -132,10 +132,10 @@ #address-cells = <3>; #interrupt-cells = <1>; reg = <0x0 0xfbc00000 0x0 0x100000>; - interrupt-map-mask = <0xf800 0 0 7>; + interrupt-map-mask = <0xf800 0 0 IRQ_INT_ALL>; /* add legacy interrupts for SATA only */ - interrupt-map = <0x4000 0 0 1 &gic 0 53 4>, - <0x4800 0 0 1 &gic 0 54 4>; + interrupt-map = <0x4000 0 0 IRQ_INTA &gic 0 53 4>, + <0x4800 0 0 IRQ_INTA &gic 0 54 4>; /* 32 bit non prefetchable memory space */ ranges = <0x2000000 0x0 0xfe000000 0x0 0xfe000000 0x0 0x1000000>; bus-range = <0x00 0x00>;arch/arm64/boot/dts/amd/amd-overdrive-rev-b0.dts +1
-1@@ -8,7 +8,7 @@ /dts-v1/; -/include/ "amd-seattle-soc.dtsi" +#include "amd-seattle-soc.dtsi" / { model = "AMD Seattle (Rev.B0) Development Board (Overdrive)";arch/arm64/boot/dts/amd/amd-overdrive-rev-b1.dts +1
-1@@ -8,7 +8,7 @@ /dts-v1/; -/include/ "amd-seattle-soc.dtsi" +#include "amd-seattle-soc.dtsi" / { model = "AMD Seattle (Rev.B1) Development Board (Overdrive)";arch/arm64/boot/dts/amd/amd-overdrive.dts +1
-1@@ -7,7 +7,7 @@ /dts-v1/; -/include/ "amd-seattle-soc.dtsi" +#include "amd-seattle-soc.dtsi" / { model = "AMD Seattle Development Board (Overdrive)";arch/arm64/boot/dts/amd/amd-seattle-soc.dtsi +7
-5@@ -5,6 +5,8 @@ * Copyright (C) 2014 Advanced Micro Devices, Inc. */ +#include <dt-bindings/interrupt-controller/irq.h> + / { compatible = "amd,seattle"; interrupt-parent = <&gic0>;@@ -213,12 +215,12 @@ msi-parent = <&v2m0>; reg = <0 0xf0000000 0 0x10000000>; - interrupt-map-mask = <0xf800 0x0 0x0 0x7>; + interrupt-map-mask = <0xf800 0x0 0x0 IRQ_INT_ALL>; interrupt-map = - <0x1000 0x0 0x0 0x1 &gic0 0x0 0x0 0x0 0x120 0x1>, - <0x1000 0x0 0x0 0x2 &gic0 0x0 0x0 0x0 0x121 0x1>, - <0x1000 0x0 0x0 0x3 &gic0 0x0 0x0 0x0 0x122 0x1>, - <0x1000 0x0 0x0 0x4 &gic0 0x0 0x0 0x0 0x123 0x1>; + <0x1000 0x0 0x0 IRQ_INTA &gic0 0x0 0x0 0x0 0x120 0x1>, + <0x1000 0x0 0x0 IRQ_INTB &gic0 0x0 0x0 0x0 0x121 0x1>, + <0x1000 0x0 0x0 IRQ_INTC &gic0 0x0 0x0 0x0 0x122 0x1>, + <0x1000 0x0 0x0 IRQ_INTD &gic0 0x0 0x0 0x0 0x123 0x1>; dma-coherent; dma-ranges = <0x43000000 0x0 0x0 0x0 0x0 0x100 0x0>;arch/arm64/boot/dts/amd/husky.dts +1
-1@@ -8,7 +8,7 @@ /dts-v1/; -/include/ "amd-seattle-soc.dtsi" +#include "amd-seattle-soc.dtsi" / { model = "Linaro 96Boards Enterprise Edition Server (Husky) Board";arch/arm64/boot/dts/arm/fvp-base-revc.dts +5
-5@@ -161,11 +161,11 @@ bus-range = <0x0 0x1>; reg = <0x0 0x40000000 0x0 0x10000000>; ranges = <0x2000000 0x0 0x50000000 0x0 0x50000000 0x0 0x10000000>; - interrupt-map = <0 0 0 1 &gic GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 2 &gic GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 3 &gic GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 4 &gic GIC_SPI 171 IRQ_TYPE_LEVEL_HIGH>; - interrupt-map-mask = <0x0 0x0 0x0 0x7>; + interrupt-map = <0 0 0 IRQ_INTA &gic GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTB &gic GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTC &gic GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTD &gic GIC_SPI 171 IRQ_TYPE_LEVEL_HIGH>; + interrupt-map-mask = <0x0 0x0 0x0 IRQ_INT_ALL>; msi-map = <0x0 &its 0x0 0x10000>; iommu-map = <0x0 &smmu 0x0 0x10000>;arch/arm64/boot/dts/arm/juno-base.dtsi +7
-5@@ -1,4 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 +#include <dt-bindings/interrupt-controller/irq.h> + #include "juno-clocks.dtsi" #include "juno-motherboard.dtsi"@@ -519,11 +521,11 @@ <0x02000000 0x00 0x50000000 0x00 0x50000000 0x0 0x08000000>, <0x42000000 0x40 0x00000000 0x40 0x00000000 0x1 0x00000000>; #interrupt-cells = <1>; - interrupt-map-mask = <0 0 0 7>; - interrupt-map = <0 0 0 1 &gic 0 0 GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 2 &gic 0 0 GIC_SPI 137 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 3 &gic 0 0 GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 4 &gic 0 0 GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>; + interrupt-map-mask = <0 0 0 IRQ_INT_ALL>; + interrupt-map = <0 0 0 IRQ_INTA &gic 0 0 GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTB &gic 0 0 GIC_SPI 137 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTC &gic 0 0 GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTD &gic 0 0 GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>; msi-parent = <&v2m_0>; status = "disabled"; iommu-map-mask = <0x0>; /* RC has no means to output PCI RID */arch/arm64/boot/dts/cavium/thunder2-99xx.dtsi +5
-5@@ -115,13 +115,13 @@ <0x02000000 0 0x40000000 0 0x40000000 0 0x20000000 0x43000000 0x40 0x00000000 0x40 0x00000000 0x20 0x00000000>; bus-range = <0 0xff>; - interrupt-map-mask = <0 0 0 7>; + interrupt-map-mask = <0 0 0 IRQ_INT_ALL>; interrupt-map = /* addr pin ic icaddr icintr */ - <0 0 0 1 &gic 0 0 GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH - 0 0 0 2 &gic 0 0 GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH - 0 0 0 3 &gic 0 0 GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH - 0 0 0 4 &gic 0 0 GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>; + <0 0 0 IRQ_INTA &gic 0 0 GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH + 0 0 0 IRQ_INTB &gic 0 0 GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH + 0 0 0 IRQ_INTC &gic 0 0 GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH + 0 0 0 IRQ_INTD &gic 0 0 GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>; msi-parent = <&gicits>; dma-coherent; };arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi +5
-5@@ -492,11 +492,11 @@ 0x82000000 0x0 0x40000000 0x40 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */ msi-parent = <&msi>; #interrupt-cells = <1>; - interrupt-map-mask = <0 0 0 7>; - interrupt-map = <0000 0 0 1 &gic 0 110 IRQ_TYPE_LEVEL_HIGH>, - <0000 0 0 2 &gic 0 111 IRQ_TYPE_LEVEL_HIGH>, - <0000 0 0 3 &gic 0 112 IRQ_TYPE_LEVEL_HIGH>, - <0000 0 0 4 &gic 0 113 IRQ_TYPE_LEVEL_HIGH>; + interrupt-map-mask = <0 0 0 IRQ_INT_ALL>; + interrupt-map = <0000 0 0 IRQ_INTA &gic 0 110 IRQ_TYPE_LEVEL_HIGH>, + <0000 0 0 IRQ_INTB &gic 0 111 IRQ_TYPE_LEVEL_HIGH>, + <0000 0 0 IRQ_INTC &gic 0 112 IRQ_TYPE_LEVEL_HIGH>, + <0000 0 0 IRQ_INTD &gic 0 113 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; }; };arch/arm64/boot/dts/hisilicon/hi3660.dtsi +5
-5@@ -1013,14 +1013,14 @@ #interrupt-cells = <1>; interrupts = <0 283 4>; interrupt-names = "msi"; - interrupt-map-mask = <0xf800 0 0 7>; - interrupt-map = <0x0 0 0 1 + interrupt-map-mask = <0xf800 0 0 IRQ_INT_ALL>; + interrupt-map = <0x0 0 0 IRQ_INTA &gic GIC_SPI 282 IRQ_TYPE_LEVEL_HIGH>, - <0x0 0 0 2 + <0x0 0 0 IRQ_INTB &gic GIC_SPI 283 IRQ_TYPE_LEVEL_HIGH>, - <0x0 0 0 3 + <0x0 0 0 IRQ_INTC &gic GIC_SPI 284 IRQ_TYPE_LEVEL_HIGH>, - <0x0 0 0 4 + <0x0 0 0 IRQ_INTD &gic GIC_SPI 285 IRQ_TYPE_LEVEL_HIGH>; clocks = <&crg_ctrl HI3660_PCIEPHY_REF>, <&crg_ctrl HI3660_CLK_GATE_PCIEAUX>,arch/arm64/boot/dts/hisilicon/hip06.dtsi +0
-3@@ -741,11 +741,11 @@ 0x5ff0000 0x01000000 0 0 0 0xb7ff0000 0 0x10000>; #interrupt-cells = <1>; - interrupt-map-mask = <0xf800 0 0 7>; - interrupt-map = <0x0 0 0 1 &mbigen_pcie0 650 4 - 0x0 0 0 2 &mbigen_pcie0 650 4
arch/arm64/boot/dts/hisilicon/hip06.dtsi line 751
Quoted 10 lines
arch/arm64/boot/dts/hisilicon/hip06.dtsi +5
-2- 0x0 0 0 3 &mbigen_pcie0 650 4 - 0x0 0 0 4 &mbigen_pcie0 650 4>; + interrupt-map-mask = <0xf800 0 0 IRQ_INT_ALL>; + interrupt-map = <0x0 0 0 IRQ_INTA &mbigen_pcie0 650 4 + 0x0 0 0 IRQ_INTB &mbigen_pcie0 650 4 + 0x0 0 0 IRQ_INTC &mbigen_pcie0 650 4 + 0x0 0 0 IRQ_INTD &mbigen_pcie0 650 4>; status = "disabled"; };
Thanks!
For the Hisilicon part,
Best Regards,
Wei
PATCH 3/7 arm: dts: Use IRQ flags for legacy PCI IRQ interrupts
In reply to Andrew MurrayReplace magic numbers used to describe legacy PCI IRQ interrupts with #define.
--- 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 ++++++++++++---------- 15 files changed, 162 insertions(+), 157 deletions(-)
arch/arm/boot/dts/alpine.dtsi +3 -3
@@ -152,10 +152,10 @@ #address-cells = <3>; #interrupt-cells = <1>; reg = <0x0 0xfbc00000 0x0 0x100000>; - interrupt-map-mask = <0xf800 0 0 7>; + interrupt-map-mask = <0xf800 0 0 IRQ_INT_ALL>; /* Add legacy interrupts for SATA devices only */ - interrupt-map = <0x4000 0 0 1 &gic 0 43 4>, - <0x4800 0 0 1 &gic 0 44 4>; + interrupt-map = <0x4000 0 0 IRQ_INTA &gic 0 43 4>, + <0x4800 0 0 IRQ_INTA &gic 0 44 4>; /* 32 bit non prefetchable memory space */ ranges = <0x02000000 0x0 0xfe000000 0x0 0xfe000000 0x0 0x1000000>;
arch/arm/boot/dts/artpec6.dtsi +5 -5
@@ -177,11 +177,11 @@ interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "msi"; #interrupt-cells = <1>; - interrupt-map-mask = <0 0 0 0x7>; - interrupt-map = <0 0 0 1 &intc GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 2 &intc GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 3 &intc GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 4 &intc GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>; + interrupt-map-mask = <0 0 0 IRQ_INT_ALL>; + interrupt-map = <0 0 0 IRQ_INTA &intc GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTB &intc GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTC &intc GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTD &intc GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>; axis,syscon-pcie = <&syscon>; status = "disabled"; };
arch/arm/boot/dts/gemini-dlink-dir-685.dts +17 -17
@@ -407,24 +407,24 @@ pci@50000000 { status = "okay"; - interrupt-map-mask = <0xf800 0 0 7>; + interrupt-map-mask = <0xf800 0 0 IRQ_INT_ALL>; interrupt-map = - <0x4800 0 0 1 &pci_intc 0>, /* Slot 9 */ - <0x4800 0 0 2 &pci_intc 1>, - <0x4800 0 0 3 &pci_intc 2>, - <0x4800 0 0 4 &pci_intc 3>, - <0x5000 0 0 1 &pci_intc 1>, /* Slot 10 */ - <0x5000 0 0 2 &pci_intc 2>, - <0x5000 0 0 3 &pci_intc 3>, - <0x5000 0 0 4 &pci_intc 0>, - <0x5800 0 0 1 &pci_intc 2>, /* Slot 11 */ - <0x5800 0 0 2 &pci_intc 3>, - <0x5800 0 0 3 &pci_intc 0>, - <0x5800 0 0 4 &pci_intc 1>, - <0x6000 0 0 1 &pci_intc 3>, /* Slot 12 */ - <0x6000 0 0 2 &pci_intc 0>, - <0x6000 0 0 3 &pci_intc 1>, - <0x6000 0 0 4 &pci_intc 2>; + <0x4800 0 0 IRQ_INTA &pci_intc 0>, /* Slot 9 */ + <0x4800 0 0 IRQ_INTB &pci_intc 1>, + <0x4800 0 0 IRQ_INTC &pci_intc 2>, + <0x4800 0 0 IRQ_INTD &pci_intc 3>, + <0x5000 0 0 IRQ_INTA &pci_intc 1>, /* Slot 10 */ + <0x5000 0 0 IRQ_INTB &pci_intc 2>, + <0x5000 0 0 IRQ_INTC &pci_intc 3>, + <0x5000 0 0 IRQ_INTD &pci_intc 0>, + <0x5800 0 0 IRQ_INTA &pci_intc 2>, /* Slot 11 */ + <0x5800 0 0 IRQ_INTB &pci_intc 3>, + <0x5800 0 0 IRQ_INTC &pci_intc 0>, + <0x5800 0 0 IRQ_INTD &pci_intc 1>, + <0x6000 0 0 IRQ_INTA &pci_intc 3>, /* Slot 12 */ + <0x6000 0 0 IRQ_INTB &pci_intc 0>, + <0x6000 0 0 IRQ_INTC &pci_intc 1>, + <0x6000 0 0 IRQ_INTD &pci_intc 2>; }; ethernet@60000000 {
arch/arm/boot/dts/gemini-sl93512r.dts +17 -17
@@ -256,24 +256,24 @@ pci@50000000 { status = "okay"; - interrupt-map-mask = <0xf800 0 0 7>; + interrupt-map-mask = <0xf800 0 0 IRQ_INT_ALL>; interrupt-map = - <0x4800 0 0 1 &pci_intc 0>, /* Slot 9 */ - <0x4800 0 0 2 &pci_intc 1>, - <0x4800 0 0 3 &pci_intc 2>, - <0x4800 0 0 4 &pci_intc 3>, - <0x5000 0 0 1 &pci_intc 1>, /* Slot 10 */ - <0x5000 0 0 2 &pci_intc 2>, - <0x5000 0 0 3 &pci_intc 3>, - <0x5000 0 0 4 &pci_intc 0>, - <0x5800 0 0 1 &pci_intc 2>, /* Slot 11 */ - <0x5800 0 0 2 &pci_intc 3>, - <0x5800 0 0 3 &pci_intc 0>, - <0x5800 0 0 4 &pci_intc 1>, - <0x6000 0 0 1 &pci_intc 3>, /* Slot 12 */ - <0x6000 0 0 2 &pci_intc 0>, - <0x6000 0 0 3 &pci_intc 1>, - <0x6000 0 0 4 &pci_intc 2>; + <0x4800 0 0 IRQ_INTA &pci_intc 0>, /* Slot 9 */ + <0x4800 0 0 IRQ_INTB &pci_intc 1>, + <0x4800 0 0 IRQ_INTC &pci_intc 2>, + <0x4800 0 0 IRQ_INTD &pci_intc 3>, + <0x5000 0 0 IRQ_INTA &pci_intc 1>, /* Slot 10 */ + <0x5000 0 0 IRQ_INTB &pci_intc 2>, + <0x5000 0 0 IRQ_INTC &pci_intc 3>, + <0x5000 0 0 IRQ_INTD &pci_intc 0>, + <0x5800 0 0 IRQ_INTA &pci_intc 2>, /* Slot 11 */ + <0x5800 0 0 IRQ_INTB &pci_intc 3>, + <0x5800 0 0 IRQ_INTC &pci_intc 0>, + <0x5800 0 0 IRQ_INTD &pci_intc 1>, + <0x6000 0 0 IRQ_INTA &pci_intc 3>, /* Slot 12 */ + <0x6000 0 0 IRQ_INTB &pci_intc 0>, + <0x6000 0 0 IRQ_INTC &pci_intc 1>, + <0x6000 0 0 IRQ_INTD &pci_intc 2>; }; ethernet@60000000 {
arch/arm/boot/dts/gemini-sq201.dts +17 -17
@@ -252,24 +252,24 @@ pci@50000000 { status = "okay"; - interrupt-map-mask = <0xf800 0 0 7>; + interrupt-map-mask = <0xf800 0 0 IRQ_INT_ALL>; interrupt-map = - <0x4800 0 0 1 &pci_intc 0>, /* Slot 9 */ - <0x4800 0 0 2 &pci_intc 1>, - <0x4800 0 0 3 &pci_intc 2>, - <0x4800 0 0 4 &pci_intc 3>, - <0x5000 0 0 1 &pci_intc 1>, /* Slot 10 */ - <0x5000 0 0 2 &pci_intc 2>, - <0x5000 0 0 3 &pci_intc 3>, - <0x5000 0 0 4 &pci_intc 0>, - <0x5800 0 0 1 &pci_intc 2>, /* Slot 11 */ - <0x5800 0 0 2 &pci_intc 3>, - <0x5800 0 0 3 &pci_intc 0>, - <0x5800 0 0 4 &pci_intc 1>, - <0x6000 0 0 1 &pci_intc 3>, /* Slot 12 */ - <0x6000 0 0 2 &pci_intc 0>, - <0x6000 0 0 3 &pci_intc 1>, - <0x6000 0 0 4 &pci_intc 2>; + <0x4800 0 0 IRQ_INTA &pci_intc 0>, /* Slot 9 */ + <0x4800 0 0 IRQ_INTB &pci_intc 1>, + <0x4800 0 0 IRQ_INTC &pci_intc 2>, + <0x4800 0 0 IRQ_INTD &pci_intc 3>, + <0x5000 0 0 IRQ_INTA &pci_intc 1>, /* Slot 10 */ + <0x5000 0 0 IRQ_INTB &pci_intc 2>, + <0x5000 0 0 IRQ_INTC &pci_intc 3>, + <0x5000 0 0 IRQ_INTD &pci_intc 0>, + <0x5800 0 0 IRQ_INTA &pci_intc 2>, /* Slot 11 */ + <0x5800 0 0 IRQ_INTB &pci_intc 3>, + <0x5800 0 0 IRQ_INTC &pci_intc 0>, + <0x5800 0 0 IRQ_INTD &pci_intc 1>, + <0x6000 0 0 IRQ_INTA &pci_intc 3>, /* Slot 12 */ + <0x6000 0 0 IRQ_INTB &pci_intc 0>, + <0x6000 0 0 IRQ_INTC &pci_intc 1>, + <0x6000 0 0 IRQ_INTD &pci_intc 2>; }; ethernet@60000000 {
arch/arm/boot/dts/gemini-wbd111.dts +17 -17
@@ -140,24 +140,24 @@ pci@50000000 { status = "okay"; - interrupt-map-mask = <0xf800 0 0 7>; + interrupt-map-mask = <0xf800 0 0 IRQ_INT_ALL>; interrupt-map = - <0x4800 0 0 1 &pci_intc 0>, /* Slot 9 */ - <0x4800 0 0 2 &pci_intc 1>, - <0x4800 0 0 3 &pci_intc 2>, - <0x4800 0 0 4 &pci_intc 3>, - <0x5000 0 0 1 &pci_intc 1>, /* Slot 10 */ - <0x5000 0 0 2 &pci_intc 2>, - <0x5000 0 0 3 &pci_intc 3>, - <0x5000 0 0 4 &pci_intc 0>, - <0x5800 0 0 1 &pci_intc 2>, /* Slot 11 */ - <0x5800 0 0 2 &pci_intc 3>, - <0x5800 0 0 3 &pci_intc 0>, - <0x5800 0 0 4 &pci_intc 1>, - <0x6000 0 0 1 &pci_intc 3>, /* Slot 12 */ - <0x6000 0 0 2 &pci_intc 0>, - <0x6000 0 0 3 &pci_intc 1>, - <0x6000 0 0 4 &pci_intc 2>; + <0x4800 0 0 IRQ_INTA &pci_intc 0>, /* Slot 9 */ + <0x4800 0 0 IRQ_INTB &pci_intc 1>, + <0x4800 0 0 IRQ_INTC &pci_intc 2>, + <0x4800 0 0 IRQ_INTD &pci_intc 3>, + <0x5000 0 0 IRQ_INTA &pci_intc 1>, /* Slot 10 */ + <0x5000 0 0 IRQ_INTB &pci_intc 2>, + <0x5000 0 0 IRQ_INTC &pci_intc 3>, + <0x5000 0 0 IRQ_INTD &pci_intc 0>, + <0x5800 0 0 IRQ_INTA &pci_intc 2>, /* Slot 11 */ + <0x5800 0 0 IRQ_INTB &pci_intc 3>, + <0x5800 0 0 IRQ_INTC &pci_intc 0>, + <0x5800 0 0 IRQ_INTD &pci_intc 1>, + <0x6000 0 0 IRQ_INTA &pci_intc 3>, /* Slot 12 */ + <0x6000 0 0 IRQ_INTB &pci_intc 0>, + <0x6000 0 0 IRQ_INTC &pci_intc 1>, + <0x6000 0 0 IRQ_INTD &pci_intc 2>; }; ethernet@60000000 {
arch/arm/boot/dts/gemini-wbd222.dts +17 -17
@@ -151,24 +151,24 @@ pci@50000000 { status = "okay"; - interrupt-map-mask = <0xf800 0 0 7>; + interrupt-map-mask = <0xf800 0 0 IRQ_INT_ALL>; interrupt-map = - <0x4800 0 0 1 &pci_intc 0>, /* Slot 9 */ - <0x4800 0 0 2 &pci_intc 1>, - <0x4800 0 0 3 &pci_intc 2>, - <0x4800 0 0 4 &pci_intc 3>, - <0x5000 0 0 1 &pci_intc 1>, /* Slot 10 */ - <0x5000 0 0 2 &pci_intc 2>, - <0x5000 0 0 3 &pci_intc 3>, - <0x5000 0 0 4 &pci_intc 0>, - <0x5800 0 0 1 &pci_intc 2>, /* Slot 11 */ - <0x5800 0 0 2 &pci_intc 3>, - <0x5800 0 0 3 &pci_intc 0>, - <0x5800 0 0 4 &pci_intc 1>, - <0x6000 0 0 1 &pci_intc 3>, /* Slot 12 */ - <0x6000 0 0 2 &pci_intc 0>, - <0x6000 0 0 3 &pci_intc 1>, - <0x6000 0 0 4 &pci_intc 2>; + <0x4800 0 0 IRQ_INTA &pci_intc 0>, /* Slot 9 */ + <0x4800 0 0 IRQ_INTB &pci_intc 1>, + <0x4800 0 0 IRQ_INTC &pci_intc 2>, + <0x4800 0 0 IRQ_INTD &pci_intc 3>, + <0x5000 0 0 IRQ_INTA &pci_intc 1>, /* Slot 10 */ + <0x5000 0 0 IRQ_INTB &pci_intc 2>, + <0x5000 0 0 IRQ_INTC &pci_intc 3>, + <0x5000 0 0 IRQ_INTD &pci_intc 0>, + <0x5800 0 0 IRQ_INTA &pci_intc 2>, /* Slot 11 */ + <0x5800 0 0 IRQ_INTB &pci_intc 3>, + <0x5800 0 0 IRQ_INTC &pci_intc 0>, + <0x5800 0 0 IRQ_INTD &pci_intc 1>, + <0x6000 0 0 IRQ_INTA &pci_intc 3>, /* Slot 12 */ + <0x6000 0 0 IRQ_INTB &pci_intc 0>, + <0x6000 0 0 IRQ_INTC &pci_intc 1>, + <0x6000 0 0 IRQ_INTD &pci_intc 2>; }; ethernet@60000000 {
arch/arm/boot/dts/imx6qdl.dtsi +5 -5
@@ -282,11 +282,11 @@ interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "msi"; #interrupt-cells = <1>; - interrupt-map-mask = <0 0 0 0x7>; - interrupt-map = <0 0 0 1 &gpc GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 2 &gpc GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 3 &gpc GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 4 &gpc GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>; + interrupt-map-mask = <0 0 0 IRQ_INT_ALL>; + interrupt-map = <0 0 0 IRQ_INTA &gpc GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTB &gpc GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTC &gpc GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTD &gpc GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX6QDL_CLK_PCIE_AXI>, <&clks IMX6QDL_CLK_LVDS1_GATE>, <&clks IMX6QDL_CLK_PCIE_REF_125M>;
arch/arm/boot/dts/imx6sx.dtsi +5 -5
@@ -1377,11 +1377,11 @@ interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "msi"; #interrupt-cells = <1>; - interrupt-map-mask = <0 0 0 0x7>; - interrupt-map = <0 0 0 1 &gpc GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 2 &gpc GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 3 &gpc GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 4 &gpc GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>; + interrupt-map-mask = <0 0 0 IRQ_INT_ALL>; + interrupt-map = <0 0 0 IRQ_INTA &gpc GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTB &gpc GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTC &gpc GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTD &gpc GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX6SX_CLK_PCIE_AXI>, <&clks IMX6SX_CLK_LVDS1_OUT>, <&clks IMX6SX_CLK_PCIE_REF_125M>,
arch/arm/boot/dts/integratorap.dts +19 -17
@@ -6,6 +6,8 @@ /dts-v1/; /include/ "integrator.dtsi" +#include <dt-bindings/interrupt-controller/irq.h> + / { model = "ARM Integrator/AP"; compatible = "arm,integrator-ap";
@@ -174,28 +176,28 @@ 0x20000000 0 0x20000000 /* 512 MB @ LB 20000000 1:1 */ 0x02000000 0 0x80000000 /* Core module alias memory */ 0x80000000 0 0x40000000>; /* 1GB @ LB 80000000 */ - interrupt-map-mask = <0xf800 0 0 0x7>; + interrupt-map-mask = <0xf800 0 0 IRQ_INT_ALL>; interrupt-map = < /* IDSEL 9 */ - 0x4800 0 0 1 &pic 13 /* INT A on slot 9 is irq 13 */ - 0x4800 0 0 2 &pic 14 /* INT B on slot 9 is irq 14 */ - 0x4800 0 0 3 &pic 15 /* INT C on slot 9 is irq 15 */ - 0x4800 0 0 4 &pic 16 /* INT D on slot 9 is irq 16 */ + 0x4800 0 0 IRQ_INTA &pic 13 /* INT A on slot 9 is irq 13 */ + 0x4800 0 0 IRQ_INTB &pic 14 /* INT B on slot 9 is irq 14 */ + 0x4800 0 0 IRQ_INTC &pic 15 /* INT C on slot 9 is irq 15 */ + 0x4800 0 0 IRQ_INTD &pic 16 /* INT D on slot 9 is irq 16 */ /* IDSEL 10 */ - 0x5000 0 0 1 &pic 14 /* INT A on slot 10 is irq 14 */ - 0x5000 0 0 2 &pic 15 /* INT B on slot 10 is irq 15 */ - 0x5000 0 0 3 &pic 16 /* INT C on slot 10 is irq 16 */ - 0x5000 0 0 4 &pic 13 /* INT D on slot 10 is irq 13 */ + 0x5000 0 0 IRQ_INTA &pic 14 /* INT A on slot 10 is irq 14 */ + 0x5000 0 0 IRQ_INTB &pic 15 /* INT B on slot 10 is irq 15 */ + 0x5000 0 0 IRQ_INTC &pic 16 /* INT C on slot 10 is irq 16 */ + 0x5000 0 0 IRQ_INTD &pic 13 /* INT D on slot 10 is irq 13 */ /* IDSEL 11 */ - 0x5800 0 0 1 &pic 15 /* INT A on slot 11 is irq 15 */ - 0x5800 0 0 2 &pic 16 /* INT B on slot 11 is irq 16 */ - 0x5800 0 0 3 &pic 13 /* INT C on slot 11 is irq 13 */ - 0x5800 0 0 4 &pic 14 /* INT D on slot 11 is irq 14 */ + 0x5800 0 0 IRQ_INTA &pic 15 /* INT A on slot 11 is irq 15 */ + 0x5800 0 0 IRQ_INTB &pic 16 /* INT B on slot 11 is irq 16 */ + 0x5800 0 0 IRQ_INTC &pic 13 /* INT C on slot 11 is irq 13 */ + 0x5800 0 0 IRQ_INTD &pic 14 /* INT D on slot 11 is irq 14 */ /* IDSEL 12 */ - 0x6000 0 0 1 &pic 16 /* INT A on slot 12 is irq 16 */ - 0x6000 0 0 2 &pic 13 /* INT B on slot 12 is irq 13 */ - 0x6000 0 0 3 &pic 14 /* INT C on slot 12 is irq 14 */ - 0x6000 0 0 4 &pic 15 /* INT D on slot 12 is irq 15 */ + 0x6000 0 0 IRQ_INTA &pic 16 /* INT A on slot 12 is irq 16 */ + 0x6000 0 0 IRQ_INTB &pic 13 /* INT B on slot 12 is irq 13 */ + 0x6000 0 0 IRQ_INTC &pic 14 /* INT C on slot 12 is irq 14 */ + 0x6000 0 0 IRQ_INTD &pic 15 /* INT D on slot 12 is irq 15 */ >; };
arch/arm/boot/dts/keystone-k2e.dtsi +6 -5
@@ -5,6 +5,7 @@ * Copyright (C) 2013-2017 Texas Instruments Incorporated - http://www.ti.com/ */ +#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/reset/ti-syscon.h> / {
@@ -153,11 +154,11 @@ /* error interrupt */ interrupts = <GIC_SPI 385 IRQ_TYPE_EDGE_RISING>; #interrupt-cells = <1>; - interrupt-map-mask = <0 0 0 7>; - interrupt-map = <0 0 0 1 &pcie_intc1 0>, /* INT A */ - <0 0 0 2 &pcie_intc1 1>, /* INT B */ - <0 0 0 3 &pcie_intc1 2>, /* INT C */ - <0 0 0 4 &pcie_intc1 3>; /* INT D */ + interrupt-map-mask = <0 0 0 IRQ_INT_ALL>; + interrupt-map = <0 0 0 IRQ_INTA &pcie_intc1 0>, + <0 0 0 IRQ_INTB &pcie_intc1 1>, + <0 0 0 IRQ_INTC &pcie_intc1 2>, + <0 0 0 IRQ_INTD &pcie_intc1 3>; pcie_msi_intc1: msi-interrupt-controller { interrupt-controller;
arch/arm/boot/dts/keystone.dtsi +5 -5
@@ -313,11 +313,11 @@ /* error interrupt */ interrupts = <GIC_SPI 38 IRQ_TYPE_EDGE_RISING>; #interrupt-cells = <1>; - interrupt-map-mask = <0 0 0 7>; - interrupt-map = <0 0 0 1 &pcie_intc0 0>, /* INT A */ - <0 0 0 2 &pcie_intc0 1>, /* INT B */ - <0 0 0 3 &pcie_intc0 2>, /* INT C */ - <0 0 0 4 &pcie_intc0 3>; /* INT D */ + interrupt-map-mask = <0 0 0 IRQ_INT_ALL>; + interrupt-map = <0 0 0 IRQ_INTA &pcie_intc0 0>, + <0 0 0 IRQ_INTB &pcie_intc0 1>, + <0 0 0 IRQ_INTC &pcie_intc0 2>, + <0 0 0 IRQ_INTD &pcie_intc0 3>; pcie_msi_intc0: msi-interrupt-controller { interrupt-controller;
arch/arm/boot/dts/qcom-apq8064.dtsi +5 -5
@@ -1391,11 +1391,11 @@ interrupts = <GIC_SPI 238 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "msi"; #interrupt-cells = <1>; - interrupt-map-mask = <0 0 0 0x7>; - interrupt-map = <0 0 0 1 &intc 0 36 IRQ_TYPE_LEVEL_HIGH>, /* int_a */ - <0 0 0 2 &intc 0 37 IRQ_TYPE_LEVEL_HIGH>, /* int_b */ - <0 0 0 3 &intc 0 38 IRQ_TYPE_LEVEL_HIGH>, /* int_c */ - <0 0 0 4 &intc 0 39 IRQ_TYPE_LEVEL_HIGH>; /* int_d */ + interrupt-map-mask = <0 0 0 IRQ_INT_ALL>; + interrupt-map = <0 0 0 IRQ_INTA &intc 0 36 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTB &intc 0 37 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTC &intc 0 38 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTD &intc 0 39 IRQ_TYPE_LEVEL_HIGH>; clocks = <&gcc PCIE_A_CLK>, <&gcc PCIE_H_CLK>, <&gcc PCIE_PHY_REF_CLK>;
arch/arm/boot/dts/qcom-ipq4019.dtsi +5 -5
@@ -398,11 +398,11 @@ interrupts = <GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "msi"; #interrupt-cells = <1>; - interrupt-map-mask = <0 0 0 0x7>; - interrupt-map = <0 0 0 1 &intc 0 142 IRQ_TYPE_LEVEL_HIGH>, /* int_a */ - <0 0 0 2 &intc 0 143 IRQ_TYPE_LEVEL_HIGH>, /* int_b */ - <0 0 0 3 &intc 0 144 IRQ_TYPE_LEVEL_HIGH>, /* int_c */ - <0 0 0 4 &intc 0 145 IRQ_TYPE_LEVEL_HIGH>; /* int_d */ + interrupt-map-mask = <0 0 0 IRQ_INT_ALL>; + interrupt-map = <0 0 0 IRQ_INTA &intc 0 142 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTB &intc 0 143 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTC &intc 0 144 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTD &intc 0 145 IRQ_TYPE_LEVEL_HIGH>; clocks = <&gcc GCC_PCIE_AHB_CLK>, <&gcc GCC_PCIE_AXI_M_CLK>, <&gcc GCC_PCIE_AXI_S_CLK>;
arch/arm/boot/dts/versatile-pb.dts +19 -17
@@ -1,6 +1,8 @@ // SPDX-License-Identifier: GPL-2.0 #include "versatile-ab.dts" +#include <dt-bindings/interrupt-controller/irq.h> + / { model = "ARM Versatile PB"; compatible = "arm,versatile-pb";
@@ -55,26 +57,26 @@ 0x02000000 0 0x50000000 0x50000000 0 0x10000000 /* non-prefetchable memory */ 0x42000000 0 0x60000000 0x60000000 0 0x10000000>; /* prefetchable memory */ - interrupt-map-mask = <0x1800 0 0 7>; - interrupt-map = <0x1800 0 0 1 &sic 28 - 0x1800 0 0 2 &sic 29 - 0x1800 0 0 3 &sic 30 - 0x1800 0 0 4 &sic 27 + interrupt-map-mask = <0x1800 0 0 IRQ_INT_ALL>; + interrupt-map = <0x1800 0 0 IRQ_INTA &sic 28 + 0x1800 0 0 IRQ_INTB &sic 29 + 0x1800 0 0 IRQ_INTC &sic 30 + 0x1800 0 0 IRQ_INTD &sic 27 - 0x1000 0 0 1 &sic 27 - 0x1000 0 0 2 &sic 28 - 0x1000 0 0 3 &sic 29 - 0x1000 0 0 4 &sic 30 + 0x1000 0 0 IRQ_INTA &sic 27 + 0x1000 0 0 IRQ_INTB &sic 28 + 0x1000 0 0 IRQ_INTC &sic 29 + 0x1000 0 0 IRQ_INTD &sic 30 - 0x0800 0 0 1 &sic 30 - 0x0800 0 0 2 &sic 27 - 0x0800 0 0 3 &sic 28 - 0x0800 0 0 4 &sic 29 + 0x0800 0 0 IRQ_INTA &sic 30 + 0x0800 0 0 IRQ_INTB &sic 27 + 0x0800 0 0 IRQ_INTC &sic 28 + 0x0800 0 0 IRQ_INTD &sic 29 - 0x0000 0 0 1 &sic 29 - 0x0000 0 0 2 &sic 30 - 0x0000 0 0 3 &sic 27 - 0x0000 0 0 4 &sic 28>; + 0x0000 0 0 IRQ_INTA &sic 29 + 0x0000 0 0 IRQ_INTB &sic 30 + 0x0000 0 0 IRQ_INTC &sic 27 + 0x0000 0 0 IRQ_INTD &sic 28>; }; fpga {
Signature · 1 line
2.21.0
Re: [PATCH v1 3/7] arm: dts: Use IRQ flags for legacy PCI IRQ interrupts
Quoted 4 lines · Andrew Murray
Replace magic numbers used to describe legacy PCI IRQ interrupts with #define.
Signed-off-by Andrew Murray <[email protected]>
Thanks for just changing them all in one patch, it is swift and elegant patching.
Yours,
Linus Walleij
Re: [PATCH v1 3/7] arm: dts: Use IRQ flags for legacy PCI IRQ interrupts
In reply to Andrew MurrayQuoted 2 lines · Andrew Murray
Replace magic numbers used to describe legacy PCI IRQ interrupts with #define.
Looks good,
Quoted 10 lines
Signed-off-by Andrew Murray <[email protected]>--- 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 +++---
Quoted 8 lines
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 ++++++++++++---------- 15 files changed, 162 insertions(+), 157 deletions(-)
/^JN - Jesper Nilsson
Signature · 6 lines
Jesper Nilsson -- [email protected] _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 4/7 xtensa: dts: Use IRQ flags for legacy PCI IRQ interrupts
In reply to Andrew MurrayReplace magic numbers used to describe legacy PCI IRQ interrupts with #define.
--- arch/xtensa/boot/dts/virt.dts | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
arch/xtensa/boot/dts/virt.dts +7 -5
@@ -1,6 +1,8 @@ // SPDX-License-Identifier: GPL-2.0 /dts-v1/; +#include <dt-bindings/interrupt-controller/irq.h> + / { compatible = "cdns,xtensa-iss"; #address-cells = <1>;
@@ -61,12 +63,12 @@ // PCI_DEVICE(3) INT#(1) CONTROLLER(PHANDLE) CONTROLLER_DATA(2) interrupt-map = < - 0x0000 0x0 0x0 0x1 &pic 0x0 0x1 - 0x0800 0x0 0x0 0x1 &pic 0x1 0x1 - 0x1000 0x0 0x0 0x1 &pic 0x2 0x1 - 0x1800 0x0 0x0 0x1 &pic 0x3 0x1 + 0x0000 0x0 0x0 IRQ_INTA &pic 0x0 0x1 + 0x0800 0x0 0x0 IRQ_INTA &pic 0x1 0x1 + 0x1000 0x0 0x0 IRQ_INTA &pic 0x2 0x1 + 0x1800 0x0 0x0 IRQ_INTA &pic 0x3 0x1 >; - interrupt-map-mask = <0x1800 0x0 0x0 0x7>; + interrupt-map-mask = <0x1800 0x0 0x0 IRQ_INT_ALL>; }; };
Signature · 1 line
2.21.0
PATCH 5/7 powerpc: dts: fsl: Use IRQ flags for legacy PCI IRQ interrupts
In reply to Andrew MurrayReplace magic numbers used to describe legacy PCI IRQ interrupts with #define.
--- 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(-)
arch/powerpc/boot/dts/fsl/b4420qds.dts +2 -2
@@ -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"
arch/powerpc/boot/dts/fsl/b4420si-post.dtsi +1 -1
@@ -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 {
arch/powerpc/boot/dts/fsl/b4860qds.dts +2 -2
@@ -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"
arch/powerpc/boot/dts/fsl/b4860si-post.dtsi +1 -1
@@ -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 {
arch/powerpc/boot/dts/fsl/b4qds.dtsi +1 -1
@@ -277,4 +277,4 @@ }; }; -/include/ "b4si-post.dtsi" +#include "b4si-post.dtsi"
arch/powerpc/boot/dts/fsl/b4si-post.dtsi +7 -5
@@ -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 >; }; };
arch/powerpc/boot/dts/fsl/bsc9132qds.dts +1 -1
@@ -43,4 +43,4 @@ }; /include/ "bsc9132qds.dtsi" -/include/ "bsc9132si-post.dtsi" +#include "bsc9132si-post.dtsi"
arch/powerpc/boot/dts/fsl/bsc9132si-post.dtsi +7 -5
@@ -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 >; }; };
arch/powerpc/boot/dts/fsl/c293pcie.dts +1 -1
@@ -221,4 +221,4 @@ phy-connection-type = "rgmii-id"; }; }; -/include/ "c293si-post.dtsi" +#include "c293si-post.dtsi"
arch/powerpc/boot/dts/fsl/c293si-post.dtsi +7 -5
@@ -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 >; }; };
arch/powerpc/boot/dts/fsl/gef_sbc310.dts +7 -5
@@ -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 {
arch/powerpc/boot/dts/fsl/mpc8536ds.dts +7 -5
@@ -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 {
arch/powerpc/boot/dts/fsl/mpc8536ds_36b.dts +7 -5
@@ -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 {
arch/powerpc/boot/dts/fsl/mpc8540ads.dts +51 -49
137 lines not on this page · raw message
arch/powerpc/boot/dts/fsl/mpc8544ds.dts +12 -10
@@ -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"
arch/powerpc/boot/dts/fsl/mpc8544ds.dtsi +12 -10
@@ -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 >;
arch/powerpc/boot/dts/fsl/mpc8548cds_32b.dts +8 -6
@@ -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"
arch/powerpc/boot/dts/fsl/mpc8548cds_36b.dts +8 -6
@@ -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"
arch/powerpc/boot/dts/fsl/mpc8548si-post.dtsi +7 -5
@@ -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 >; }; };
arch/powerpc/boot/dts/fsl/mpc8560ads.dts +51 -49
137 lines not on this page · raw message
arch/powerpc/boot/dts/fsl/mpc8568mds.dts +12 -10
@@ -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"
arch/powerpc/boot/dts/fsl/mpc8568si-post.dtsi +7 -5
@@ -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 >; }; };
arch/powerpc/boot/dts/fsl/mpc8569mds.dts +1 -1
@@ -440,4 +440,4 @@ }; }; -/include/ "mpc8569si-post.dtsi" +#include "mpc8569si-post.dtsi"
arch/powerpc/boot/dts/fsl/mpc8569si-post.dtsi +7 -5
@@ -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 >; }; };
arch/powerpc/boot/dts/fsl/mpc8641_hpcn.dts +76 -74
202 lines not on this page · raw message
arch/powerpc/boot/dts/fsl/mpc8641_hpcn_36b.dts +76 -74
202 lines not on this page · raw message
arch/powerpc/boot/dts/fsl/p2020ds.dts +1 -1
@@ -82,4 +82,4 @@ */ /include/ "p2020si-post.dtsi" -/include/ "p2020ds.dtsi" +#include "p2020ds.dtsi"
arch/powerpc/boot/dts/fsl/p2020ds.dtsi +24 -22
81 lines not on this page · raw message
arch/powerpc/boot/dts/fsl/ppa8548.dts +1 -1
@@ -157,4 +157,4 @@ }; }; -/include/ "mpc8548si-post.dtsi" +#include "mpc8548si-post.dtsi"
arch/powerpc/boot/dts/fsl/sbc8641d.dts +3 -1
@@ -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
Signature · 1 line
2.21.0
Re: [PATCH v1 5/7] powerpc: dts: fsl: Use IRQ flags for legacy PCI IRQ interrupts
Quoted 28 lines · Andrew Murray
Replace magic numbers used to describe legacy PCI IRQ interrupts with #define.
Signed-off-by Andrew Murray <[email protected]>--- 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 +-
Quoted 8 lines
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(-)
cheers
PATCH 6/7 powerpc: dts: Use IRQ flags for legacy PCI IRQ interrupts
In reply to Andrew MurrayReplace magic numbers used to describe legacy PCI IRQ interrupts with #define.
--- 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(-)
arch/powerpc/boot/dts/bluestone.dts +7 -5
@@ -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 {
arch/powerpc/boot/dts/charon.dts +7 -5
@@ -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>;
arch/powerpc/boot/dts/digsy_mtc.dts +7 -5
@@ -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>;
arch/powerpc/boot/dts/haleakala.dts +7 -5
@@ -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 */>; }; }; };
arch/powerpc/boot/dts/holly.dts +22 -20
58 lines not on this page · raw message
arch/powerpc/boot/dts/hotfoot.dts +7 -5
@@ -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 >; }; };
arch/powerpc/boot/dts/kuroboxHD.dts +15 -13
@@ -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 >; }; };
arch/powerpc/boot/dts/kuroboxHG.dts +15 -13
@@ -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 >; }; };
arch/powerpc/boot/dts/lite5200.dts +7 -5
@@ -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>;
arch/powerpc/boot/dts/lite5200b.dts +12 -10
@@ -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>;
arch/powerpc/boot/dts/media5200.dts +14 -12
@@ -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
arch/powerpc/boot/dts/mpc5121ads.dts +11 -9
@@ -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 >; }; };
arch/powerpc/boot/dts/mpc8308rdb.dts +7 -5
@@ -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>;
arch/powerpc/boot/dts/mpc8313erdb.dts +11 -9
@@ -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>;
arch/powerpc/boot/dts/mpc832x_mds.dts +31 -29
86 lines not on this page · raw message
arch/powerpc/boot/dts/mpc832x_rdb.dts +12 -10
@@ -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>;
arch/powerpc/boot/dts/mpc8349emitxgp.dts +5 -3
@@ -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>;
arch/powerpc/boot/dts/mpc836x_mds.dts +31 -29
87 lines not on this page · raw message
arch/powerpc/boot/dts/mpc836x_rdk.dts +9 -7
@@ -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>;
arch/powerpc/boot/dts/mucmc52.dts +7 -5
@@ -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
arch/powerpc/boot/dts/mvme5100.dts +25 -23
84 lines not on this page · raw message
arch/powerpc/boot/dts/pcm030.dts +12 -10
@@ -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>;
arch/powerpc/boot/dts/pcm032.dts +12 -10
@@ -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>;
arch/powerpc/boot/dts/pq2fads.dts +15 -13
@@ -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>;
arch/powerpc/boot/dts/socrates.dts +5 -3
@@ -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>;
arch/powerpc/boot/dts/storcenter.dts +15 -13
@@ -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 >; };
arch/powerpc/boot/dts/stx_gp3_8560.dts +19 -17
@@ -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>;
arch/powerpc/boot/dts/taishan.dts +11 -9
@@ -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 >; }; };
arch/powerpc/boot/dts/tqm5200.dts +7 -5
@@ -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>;
arch/powerpc/boot/dts/tqm8540.dts +9 -7
@@ -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>;
arch/powerpc/boot/dts/tqm8541.dts +9 -7
@@ -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>;
arch/powerpc/boot/dts/tqm8555.dts +9 -7
@@ -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>;
arch/powerpc/boot/dts/tqm8560.dts +9 -7
@@ -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>;
arch/powerpc/boot/dts/virtex440-ml510.dts +23 -20
82 lines not on this page · raw message
arch/powerpc/boot/dts/xcalibur1501.dts +8 -5
@@ -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>;
arch/powerpc/boot/dts/xpedite5200.dts +5 -3
@@ -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>;
Signature · 1 line
2.21.0
Re: [PATCH v1 6/7] powerpc: dts: Use IRQ flags for legacy PCI IRQ interrupts
Quoted 34 lines · Andrew Murray
Replace magic numbers used to describe legacy PCI IRQ interrupts with #define.
Signed-off-by Andrew Murray <[email protected]>--- 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 +++--
Quoted 8 lines
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(-)
cheers
PATCH 7/7 dt-bindings: PCI: Use IRQ flags for legacy PCI IRQ interrupts
In reply to Andrew MurrayReplace magic numbers used to describe legacy PCI IRQ interrupts with #define.
--- .../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 +++--- 27 files changed, 224 insertions(+), 224 deletions(-)
Documentation/devicetree/bindings/pci/83xx-512x-pci.txt +9 -9
@@ -9,19 +9,19 @@ Freescale 83xx and 512x SOCs include the same PCI bridge core. Example (MPC8313ERDB) pci0: pci@e0008500 { - 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>;
Documentation/devicetree/bindings/pci/aardvark-pci.txt +5 -5
@@ -43,11 +43,11 @@ Example: msi-parent = <&pcie0>; ranges = <0x82000000 0 0xe8000000 0 0xe8000000 0 0x1000000 /* Port 0 MEM */ 0x81000000 0 0xe9000000 0 0xe9000000 0 0x10000>; /* Port 0 IO*/ - interrupt-map-mask = <0 0 0 7>; - interrupt-map = <0 0 0 1 &pcie_intc 0>, - <0 0 0 2 &pcie_intc 1>, - <0 0 0 3 &pcie_intc 2>, - <0 0 0 4 &pcie_intc 3>; + interrupt-map-mask = <0 0 0 IRQ_INT_ALL>; + interrupt-map = <0 0 0 IRQ_INTA &pcie_intc 0>, + <0 0 0 IRQ_INTB &pcie_intc 1>, + <0 0 0 IRQ_INTC &pcie_intc 2>, + <0 0 0 IRQ_INTD &pcie_intc 3>; pcie_intc: interrupt-controller { interrupt-controller; #interrupt-cells = <1>;
Documentation/devicetree/bindings/pci/altera-pcie.txt +5 -5
@@ -40,11 +40,11 @@ Example msi-parent = <&msi_to_gic_gen_0>; #address-cells = <3>; #size-cells = <2>; - interrupt-map-mask = <0 0 0 7>; - interrupt-map = <0 0 0 1 &pcie_0 1>, - <0 0 0 2 &pcie_0 2>, - <0 0 0 3 &pcie_0 3>, - <0 0 0 4 &pcie_0 4>; + interrupt-map-mask = <0 0 0 IRQ_INT_ALL>; + interrupt-map = <0 0 0 IRQ_INTA &pcie_0 1>, + <0 0 0 IRQ_INTB &pcie_0 2>, + <0 0 0 IRQ_INTC &pcie_0 3>, + <0 0 0 IRQ_INTD &pcie_0 4>; ranges = <0x82000000 0x00000000 0x00000000 0xc0000000 0x00000000 0x10000000 0x82000000 0x00000000 0x10000000 0xd0000000 0x00000000 0x10000000>; };
Documentation/devicetree/bindings/pci/axis,artpec6-pcie.txt +5 -5
@@ -41,10 +41,10 @@ Example: interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "msi"; #interrupt-cells = <1>; - interrupt-map-mask = <0 0 0 0x7>; - interrupt-map = <0 0 0 1 &intc GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 2 &intc GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 3 &intc GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 4 &intc GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>; + interrupt-map-mask = <0 0 0 IRQ_INT_ALL>; + interrupt-map = <0 0 0 IRQ_INTA &intc GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTB &intc GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTC &intc GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTD &intc GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>; axis,syscon-pcie = <&syscon>; };
Documentation/devicetree/bindings/pci/cdns,cdns-pcie-host.txt +5 -5
@@ -52,12 +52,12 @@ pcie@fb000000 { #interrupt-cells = <0x1>; - interrupt-map = <0x0 0x0 0x0 0x1 &gic 0x0 0x0 0x0 14 0x1 - 0x0 0x0 0x0 0x2 &gic 0x0 0x0 0x0 15 0x1 - 0x0 0x0 0x0 0x3 &gic 0x0 0x0 0x0 16 0x1 - 0x0 0x0 0x0 0x4 &gic 0x0 0x0 0x0 17 0x1>; + interrupt-map = <0x0 0x0 0x0 IRQ_INTA &gic 0x0 0x0 0x0 14 0x1 + 0x0 0x0 0x0 IRQ_INTB &gic 0x0 0x0 0x0 15 0x1 + 0x0 0x0 0x0 IRQ_INTC &gic 0x0 0x0 0x0 16 0x1 + 0x0 0x0 0x0 IRQ_INTD &gic 0x0 0x0 0x0 17 0x1>; - interrupt-map-mask = <0x0 0x0 0x0 0x7>; + interrupt-map-mask = <0x0 0x0 0x0 IRQ_INT_ALL>; msi-parent = <&its_pci>;
Documentation/devicetree/bindings/pci/faraday,ftpci100.txt +34 -34
82 lines not on this page · raw message
Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt +5 -5
@@ -77,11 +77,11 @@ Example: interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "msi"; #interrupt-cells = <1>; - interrupt-map-mask = <0 0 0 0x7>; - interrupt-map = <0 0 0 1 &intc GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 2 &intc GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 3 &intc GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 4 &intc GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>; + interrupt-map-mask = <0 0 0 IRQ_INT_ALL>; + interrupt-map = <0 0 0 IRQ_INTA &intc GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTB &intc GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTC &intc GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTD &intc GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks 144>, <&clks 206>, <&clks 189>; clock-names = "pcie", "pcie_bus", "pcie_phy"; };
Documentation/devicetree/bindings/pci/hisilicon-pcie.txt +10 -10
@@ -35,11 +35,11 @@ Hip05 Example (note that Hip06 is the same except compatible): num-lanes = <8>; port-id = <1>; #interrupt-cells = <1>; - interrupt-map-mask = <0xf800 0 0 7>; - interrupt-map = <0x0 0 0 1 &mbigen_pcie 1 10 - 0x0 0 0 2 &mbigen_pcie 2 11 - 0x0 0 0 3 &mbigen_pcie 3 12 - 0x0 0 0 4 &mbigen_pcie 4 13>; + interrupt-map-mask = <0xf800 0 0 IRQ_INT_ALL>; + interrupt-map = <0x0 0 0 IRQ_INTA &mbigen_pcie 1 10 + 0x0 0 0 IRQ_INTB &mbigen_pcie 2 11 + 0x0 0 0 IRQ_INTC &mbigen_pcie 3 12 + 0x0 0 0 IRQ_INTD &mbigen_pcie 4 13>; }; HiSilicon Hip06/Hip07 PCIe host bridge DT (almost-ECAM) description.
@@ -77,9 +77,9 @@ Example: ranges = <0x02000000 0 0xb2000000 0x0 0xb2000000 0 0x5ff0000 0x01000000 0 0 0 0xb7ff0000 0 0x10000>; #interrupt-cells = <1>; - interrupt-map-mask = <0xf800 0 0 7>; - interrupt-map = <0x0 0 0 1 &mbigen_pcie0 650 4 - 0x0 0 0 2 &mbigen_pcie0 650 4 - 0x0 0 0 3 &mbigen_pcie0 650 4 - 0x0 0 0 4 &mbigen_pcie0 650 4>; + interrupt-map-mask = <0xf800 0 0 IRQ_INT_ALL>; + interrupt-map = <0x0 0 0 IRQ_INTA &mbigen_pcie0 650 4 + 0x0 0 0 IRQ_INTB &mbigen_pcie0 650 4 + 0x0 0 0 IRQ_INTC &mbigen_pcie0 650 4 + 0x0 0 0 IRQ_INTD &mbigen_pcie0 650 4>; };
Documentation/devicetree/bindings/pci/host-generic-pci.txt +5 -5
@@ -91,11 +91,11 @@ pci { #interrupt-cells = <0x1>; // PCI_DEVICE(3) INT#(1) CONTROLLER(PHANDLE) CONTROLLER_DATA(3) - interrupt-map = < 0x0 0x0 0x0 0x1 &gic 0x0 0x4 0x1 - 0x800 0x0 0x0 0x1 &gic 0x0 0x5 0x1 - 0x1000 0x0 0x0 0x1 &gic 0x0 0x6 0x1 - 0x1800 0x0 0x0 0x1 &gic 0x0 0x7 0x1>; + interrupt-map = < 0x0 0x0 0x0 IRQ_INTA &gic 0x0 0x4 0x1 + 0x800 0x0 0x0 IRQ_INTA &gic 0x0 0x5 0x1 + 0x1000 0x0 0x0 IRQ_INTA &gic 0x0 0x6 0x1 + 0x1800 0x0 0x0 IRQ_INTA &gic 0x0 0x7 0x1>; // PCI_DEVICE(3) INT#(1) - interrupt-map-mask = <0xf800 0x0 0x0 0x7>; + interrupt-map-mask = <0xf800 0x0 0x0 IRQ_MAP_ALL>; }
Documentation/devicetree/bindings/pci/kirin-pcie.txt +5 -5
@@ -34,11 +34,11 @@ Example based on kirin960: ranges = <0x02000000 0x0 0x00000000 0x0 0xf5000000 0x0 0x2000000>; num-lanes = <1>; #interrupt-cells = <1>; - interrupt-map-mask = <0xf800 0 0 7>; - interrupt-map = <0x0 0 0 1 &gic 0 0 0 282 4>, - <0x0 0 0 2 &gic 0 0 0 283 4>, - <0x0 0 0 3 &gic 0 0 0 284 4>, - <0x0 0 0 4 &gic 0 0 0 285 4>; + interrupt-map-mask = <0xf800 0 0 IRQ_INT_ALL>; + interrupt-map = <0x0 0 0 IRQ_INTA &gic 0 0 0 282 4>, + <0x0 0 0 IRQ_INTB &gic 0 0 0 283 4>, + <0x0 0 0 IRQ_INTC &gic 0 0 0 284 4>, + <0x0 0 0 IRQ_INTD &gic 0 0 0 285 4>; clocks = <&crg_ctrl HI3660_PCIEPHY_REF>, <&crg_ctrl HI3660_CLK_GATE_PCIEAUX>, <&crg_ctrl HI3660_PCLK_GATE_PCIE_PHY>,
Documentation/devicetree/bindings/pci/layerscape-pci.txt +5 -5
@@ -56,9 +56,9 @@ Example: 0xc2000000 0x0 0x20000000 0x40 0x20000000 0x0 0x20000000 /* prefetchable memory */ 0x82000000 0x0 0x40000000 0x40 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */ #interrupt-cells = <1>; - interrupt-map-mask = <0 0 0 7>; - interrupt-map = <0000 0 0 1 &gic GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>, - <0000 0 0 2 &gic GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>, - <0000 0 0 3 &gic GIC_SPI 190 IRQ_TYPE_LEVEL_HIGH>, - <0000 0 0 4 &gic GIC_SPI 192 IRQ_TYPE_LEVEL_HIGH>; + interrupt-map-mask = <0 0 0 IRQ_INT_ALL>; + interrupt-map = <0000 0 0 IRQ_INTA &gic GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>, + <0000 0 0 IRQ_INTB &gic GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>, + <0000 0 0 IRQ_INTC &gic GIC_SPI 190 IRQ_TYPE_LEVEL_HIGH>, + <0000 0 0 IRQ_INTD &gic GIC_SPI 192 IRQ_TYPE_LEVEL_HIGH>; };
Documentation/devicetree/bindings/pci/mediatek-pcie.txt +20 -20
@@ -169,11 +169,11 @@ Examples for MT2712: #size-cells = <2>; #interrupt-cells = <1>; ranges; - interrupt-map-mask = <0 0 0 7>; - interrupt-map = <0 0 0 1 &pcie_intc0 0>, - <0 0 0 2 &pcie_intc0 1>, - <0 0 0 3 &pcie_intc0 2>, - <0 0 0 4 &pcie_intc0 3>; + interrupt-map-mask = <0 0 0 IRQ_INT_ALL>; + interrupt-map = <0 0 0 IRQ_INTA &pcie_intc0 0>, + <0 0 0 IRQ_INTB &pcie_intc0 1>, + <0 0 0 IRQ_INTC &pcie_intc0 2>, + <0 0 0 IRQ_INTD &pcie_intc0 3>; pcie_intc0: interrupt-controller { interrupt-controller; #address-cells = <0>;
@@ -187,11 +187,11 @@ Examples for MT2712: #size-cells = <2>; #interrupt-cells = <1>; ranges; - interrupt-map-mask = <0 0 0 7>; - interrupt-map = <0 0 0 1 &pcie_intc1 0>, - <0 0 0 2 &pcie_intc1 1>, - <0 0 0 3 &pcie_intc1 2>, - <0 0 0 4 &pcie_intc1 3>; + interrupt-map-mask = <0 0 0 IRQ_INT_ALL>; + interrupt-map = <0 0 0 IRQ_INTA &pcie_intc1 0>, + <0 0 0 IRQ_INTB &pcie_intc1 1>, + <0 0 0 IRQ_INTC &pcie_intc1 2>, + <0 0 0 IRQ_INTD &pcie_intc1 3>; pcie_intc1: interrupt-controller { interrupt-controller; #address-cells = <0>;
@@ -240,11 +240,11 @@ Examples for MT7622: #size-cells = <2>; #interrupt-cells = <1>; ranges; - interrupt-map-mask = <0 0 0 7>; - interrupt-map = <0 0 0 1 &pcie_intc0 0>, - <0 0 0 2 &pcie_intc0 1>, - <0 0 0 3 &pcie_intc0 2>, - <0 0 0 4 &pcie_intc0 3>; + interrupt-map-mask = <0 0 0 IRQ_INT_ALL>; + interrupt-map = <0 0 0 IRQ_INTA &pcie_intc0 0>, + <0 0 0 IRQ_INTB &pcie_intc0 1>, + <0 0 0 IRQ_INTC &pcie_intc0 2>, + <0 0 0 IRQ_INTD &pcie_intc0 3>; pcie_intc0: interrupt-controller { interrupt-controller; #address-cells = <0>;
@@ -258,11 +258,11 @@ Examples for MT7622: #size-cells = <2>; #interrupt-cells = <1>; ranges; - interrupt-map-mask = <0 0 0 7>; - interrupt-map = <0 0 0 1 &pcie_intc1 0>, - <0 0 0 2 &pcie_intc1 1>, - <0 0 0 3 &pcie_intc1 2>, - <0 0 0 4 &pcie_intc1 3>; + interrupt-map-mask = <0 0 0 IRQ_INT_ALL>; + interrupt-map = <0 0 0 IRQ_INTA &pcie_intc1 0>, + <0 0 0 IRQ_INTB &pcie_intc1 1>, + <0 0 0 IRQ_INTC &pcie_intc1 2>, + <0 0 0 IRQ_INTD &pcie_intc1 3>; pcie_intc1: interrupt-controller { interrupt-controller; #address-cells = <0>;
Documentation/devicetree/bindings/pci/mobiveil-pcie.txt +4 -4
@@ -62,11 +62,11 @@ Example: interrupt-parent = <&gic>; #interrupt-cells = <1>; interrupts = < 0 89 4 >; - interrupt-map-mask = <0 0 0 7>; + interrupt-map-mask = <0 0 0 IRQ_INT_ALL>; interrupt-map = <0 0 0 0 &pci_express 0>, - <0 0 0 1 &pci_express 1>, - <0 0 0 2 &pci_express 2>, - <0 0 0 3 &pci_express 3>; + <0 0 0 IRQ_INTA &pci_express 1>, + <0 0 0 IRQ_INTB &pci_express 2>, + <0 0 0 IRQ_INTC &pci_express 3>; ranges = < 0x83000000 0 0x00000000 0xa8000000 0 0x8000000>; };
Documentation/devicetree/bindings/pci/pci-rcar-gen2.txt +4 -4
@@ -56,10 +56,10 @@ Example SoC configuration: #size-cells = <2>; #interrupt-cells = <1>; dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x40000000>; - interrupt-map-mask = <0xff00 0 0 0x7>; - interrupt-map = <0x0000 0 0 1 &gic 0 108 IRQ_TYPE_LEVEL_HIGH - 0x0800 0 0 1 &gic 0 108 IRQ_TYPE_LEVEL_HIGH - 0x1000 0 0 2 &gic 0 108 IRQ_TYPE_LEVEL_HIGH>; + interrupt-map-mask = <0xff00 0 0 IRQ_INT_ALL>; + interrupt-map = <0x0000 0 0 IRQ_INTA &gic 0 108 IRQ_TYPE_LEVEL_HIGH + 0x0800 0 0 IRQ_INTA &gic 0 108 IRQ_TYPE_LEVEL_HIGH + 0x1000 0 0 IRQ_INTB &gic 0 108 IRQ_TYPE_LEVEL_HIGH>; usb@1,0 { reg = <0x800 0 0 0 0>;
Documentation/devicetree/bindings/pci/pci-thunder-pem.txt +5 -5
@@ -35,9 +35,9 @@ Example: <0x03000000 0x87e0 0xc2f00000 0x87e0 0xc2000000 0x00 0x00100000>; /* mem64 PEM BAR4 */ #interrupt-cells = <1>; - interrupt-map-mask = <0 0 0 7>; - interrupt-map = <0 0 0 1 &gic0 0 0 0 24 4>, /* INTA */ - <0 0 0 2 &gic0 0 0 0 25 4>, /* INTB */ - <0 0 0 3 &gic0 0 0 0 26 4>, /* INTC */ - <0 0 0 4 &gic0 0 0 0 27 4>; /* INTD */ + interrupt-map-mask = <0 0 0 IRQ_INT_ALL>; + interrupt-map = <0 0 0 IRQ_INTA &gic0 0 0 0 24 4>, + <0 0 0 IRQ_INTB &gic0 0 0 0 25 4>, + <0 0 0 IRQ_INTC &gic0 0 0 0 26 4>, + <0 0 0 IRQ_INTD &gic0 0 0 0 27 4>; };
Documentation/devicetree/bindings/pci/pcie-al.txt +2 -2
@@ -40,7 +40,7 @@ Example: #size-cells = <2>; #interrupt-cells = <1>; interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>; - interrupt-map-mask = <0x00 0 0 7>; - interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>; /* INTa */ + interrupt-map-mask = <0x00 0 0 IRQ_INT_ALL>; + interrupt-map = <0x0000 0 0 IRQ_INTA &gic GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>; ranges = <0x02000000 0x0 0xc0010000 0x0 0xc0010000 0x0 0x07ff0000>; };
Documentation/devicetree/bindings/pci/qcom,pcie.txt +10 -10
@@ -251,11 +251,11 @@ interrupts = <GIC_SPI 238 IRQ_TYPE_NONE>; interrupt-names = "msi"; #interrupt-cells = <1>; - interrupt-map-mask = <0 0 0 0x7>; - interrupt-map = <0 0 0 1 &intc 0 36 IRQ_TYPE_LEVEL_HIGH>, /* int_a */ - <0 0 0 2 &intc 0 37 IRQ_TYPE_LEVEL_HIGH>, /* int_b */ - <0 0 0 3 &intc 0 38 IRQ_TYPE_LEVEL_HIGH>, /* int_c */ - <0 0 0 4 &intc 0 39 IRQ_TYPE_LEVEL_HIGH>; /* int_d */ + interrupt-map-mask = <0 0 0 IRQ_INT_ALL>; + interrupt-map = <0 0 0 IRQ_INTA &intc 0 36 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTB &intc 0 37 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTC &intc 0 38 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTD &intc 0 39 IRQ_TYPE_LEVEL_HIGH>; clocks = <&gcc PCIE_A_CLK>, <&gcc PCIE_H_CLK>, <&gcc PCIE_PHY_CLK>;
@@ -289,11 +289,11 @@ interrupts = <GIC_SPI 243 IRQ_TYPE_NONE>; interrupt-names = "msi"; #interrupt-cells = <1>; - interrupt-map-mask = <0 0 0 0x7>; - interrupt-map = <0 0 0 1 &intc 0 244 IRQ_TYPE_LEVEL_HIGH>, /* int_a */ - <0 0 0 2 &intc 0 245 IRQ_TYPE_LEVEL_HIGH>, /* int_b */ - <0 0 0 3 &intc 0 247 IRQ_TYPE_LEVEL_HIGH>, /* int_c */ - <0 0 0 4 &intc 0 248 IRQ_TYPE_LEVEL_HIGH>; /* int_d */ + interrupt-map-mask = <0 0 0 IRQ_INT_ALL>; + interrupt-map = <0 0 0 IRQ_INTA &intc 0 244 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTB &intc 0 245 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTC &intc 0 247 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 IRQ_INTD &intc 0 248 IRQ_TYPE_LEVEL_HIGH>; clocks = <&gcc GCC_PCIE_0_CFG_AHB_CLK>, <&gcc GCC_PCIE_0_MSTR_AXI_CLK>, <&gcc GCC_PCIE_0_SLV_AXI_CLK>,
Documentation/devicetree/bindings/pci/ralink,rt3883-pci.txt +9 -9
@@ -131,18 +131,18 @@ 0x01000000 0 0x00000000 0x10160000 0 0x00010000 /* io space */ >; - interrupt-map-mask = <0xf800 0 0 7>; + interrupt-map-mask = <0xf800 0 0 IRQ_INT_ALL>; interrupt-map = < /* IDSEL 17 */ - 0x8800 0 0 1 &pciintc 18 - 0x8800 0 0 2 &pciintc 18 - 0x8800 0 0 3 &pciintc 18 - 0x8800 0 0 4 &pciintc 18 + 0x8800 0 0 IRQ_INTA &pciintc 18 + 0x8800 0 0 IRQ_INTB &pciintc 18 + 0x8800 0 0 IRQ_INTC &pciintc 18 + 0x8800 0 0 IRQ_INTD &pciintc 18 /* IDSEL 18 */ - 0x9000 0 0 1 &pciintc 19 - 0x9000 0 0 2 &pciintc 19 - 0x9000 0 0 3 &pciintc 19 - 0x9000 0 0 4 &pciintc 19 + 0x9000 0 0 IRQ_INTA &pciintc 19 + 0x9000 0 0 IRQ_INTB &pciintc 19 + 0x9000 0 0 IRQ_INTC &pciintc 19 + 0x9000 0 0 IRQ_INTD &pciintc 19 >; pci-bridge@1 {
Documentation/devicetree/bindings/pci/rockchip-pcie-host.txt +5 -5
@@ -112,11 +112,11 @@ pcie0: pcie@f8000000 { pinctrl-names = "default"; pinctrl-0 = <&pcie_clkreq>; #interrupt-cells = <1>; - interrupt-map-mask = <0 0 0 7>; - interrupt-map = <0 0 0 1 &pcie0_intc 0>, - <0 0 0 2 &pcie0_intc 1>, - <0 0 0 3 &pcie0_intc 2>, - <0 0 0 4 &pcie0_intc 3>; + interrupt-map-mask = <0 0 0 IRQ_INT_ALL>; + interrupt-map = <0 0 0 IRQ_INTA &pcie0_intc 0>, + <0 0 0 IRQ_INTB &pcie0_intc 1>, + <0 0 0 IRQ_INTC &pcie0_intc 2>, + <0 0 0 IRQ_INTD &pcie0_intc 3>; pcie0_intc: interrupt-controller { interrupt-controller; #address-cells = <0>;
Documentation/devicetree/bindings/pci/ti-pci.txt +5 -5
@@ -88,11 +88,11 @@ axi { ti,hwmods = "pcie1"; phys = <&pcie1_phy>; phy-names = "pcie-phy0"; - interrupt-map-mask = <0 0 0 7>; - interrupt-map = <0 0 0 1 &pcie_intc 1>, - <0 0 0 2 &pcie_intc 2>, - <0 0 0 3 &pcie_intc 3>, - <0 0 0 4 &pcie_intc 4>; + interrupt-map-mask = <0 0 0 IRQ_INT_ALL>; + interrupt-map = <0 0 0 IRQ_INTA &pcie_intc 1>, + <0 0 0 IRQ_INTB &pcie_intc 2>, + <0 0 0 IRQ_INTC &pcie_intc 3>, + <0 0 0 IRQ_INTD &pcie_intc 4>; pcie_intc: interrupt-controller { interrupt-controller; #address-cells = <0>;
Documentation/devicetree/bindings/pci/uniphier-pcie.txt +5 -5
@@ -66,11 +66,11 @@ Example: #interrupt-cells = <1>; interrupt-names = "dma", "msi"; interrupts = <0 224 4>, <0 225 4>; - interrupt-map-mask = <0 0 0 7>; - interrupt-map = <0 0 0 1 &pcie_intc 0>, /* INTA */ - <0 0 0 2 &pcie_intc 1>, /* INTB */ - <0 0 0 3 &pcie_intc 2>, /* INTC */ - <0 0 0 4 &pcie_intc 3>; /* INTD */ + interrupt-map-mask = <0 0 0 IRQ_INT_ALL>; + interrupt-map = <0 0 0 IRQ_INTA &pcie_intc 0>, + <0 0 0 IRQ_INTB &pcie_intc 1>, + <0 0 0 IRQ_INTC &pcie_intc 2>, + <0 0 0 IRQ_INTD &pcie_intc 3>; pcie_intc: legacy-interrupt-controller { interrupt-controller;
Documentation/devicetree/bindings/pci/v3-v360epc-pci.txt +17 -17
@@ -50,27 +50,27 @@ pci: pciv3@62000000 { 0x20000000 0 0x20000000 /* 512 MB @ LB 20000000 1:1 */ 0x02000000 0 0x80000000 /* Core module alias memory */ 0x80000000 0 0x40000000>; /* 1GB @ LB 80000000 */ - interrupt-map-mask = <0xf800 0 0 0x7>; + interrupt-map-mask = <0xf800 0 0 IRQ_INT_ALL>; interrupt-map = < /* IDSEL 9 */ - 0x4800 0 0 1 &pic 13 /* INT A on slot 9 is irq 13 */ - 0x4800 0 0 2 &pic 14 /* INT B on slot 9 is irq 14 */ - 0x4800 0 0 3 &pic 15 /* INT C on slot 9 is irq 15 */ - 0x4800 0 0 4 &pic 16 /* INT D on slot 9 is irq 16 */ + 0x4800 0 0 IRQ_INTA &pic 13 /* INT A on slot 9 is irq 13 */ + 0x4800 0 0 IRQ_INTB &pic 14 /* INT B on slot 9 is irq 14 */ + 0x4800 0 0 IRQ_INTC &pic 15 /* INT C on slot 9 is irq 15 */ + 0x4800 0 0 IRQ_INTD &pic 16 /* INT D on slot 9 is irq 16 */ /* IDSEL 10 */ - 0x5000 0 0 1 &pic 14 /* INT A on slot 10 is irq 14 */ - 0x5000 0 0 2 &pic 15 /* INT B on slot 10 is irq 15 */ - 0x5000 0 0 3 &pic 16 /* INT C on slot 10 is irq 16 */ - 0x5000 0 0 4 &pic 13 /* INT D on slot 10 is irq 13 */ + 0x5000 0 0 IRQ_INTA &pic 14 /* INT A on slot 10 is irq 14 */ + 0x5000 0 0 IRQ_INTB &pic 15 /* INT B on slot 10 is irq 15 */ + 0x5000 0 0 IRQ_INTC &pic 16 /* INT C on slot 10 is irq 16 */ + 0x5000 0 0 IRQ_INTD &pic 13 /* INT D on slot 10 is irq 13 */ /* IDSEL 11 */ - 0x5800 0 0 1 &pic 15 /* INT A on slot 11 is irq 15 */ - 0x5800 0 0 2 &pic 16 /* INT B on slot 11 is irq 16 */ - 0x5800 0 0 3 &pic 13 /* INT C on slot 11 is irq 13 */ - 0x5800 0 0 4 &pic 14 /* INT D on slot 11 is irq 14 */ + 0x5800 0 0 IRQ_INTA &pic 15 /* INT A on slot 11 is irq 15 */ + 0x5800 0 0 IRQ_INTB &pic 16 /* INT B on slot 11 is irq 16 */ + 0x5800 0 0 IRQ_INTC &pic 13 /* INT C on slot 11 is irq 13 */ + 0x5800 0 0 IRQ_INTD &pic 14 /* INT D on slot 11 is irq 14 */ /* IDSEL 12 */ - 0x6000 0 0 1 &pic 16 /* INT A on slot 12 is irq 16 */ - 0x6000 0 0 2 &pic 13 /* INT B on slot 12 is irq 13 */ - 0x6000 0 0 3 &pic 14 /* INT C on slot 12 is irq 14 */ - 0x6000 0 0 4 &pic 15 /* INT D on slot 12 is irq 15 */ + 0x6000 0 0 IRQ_INTA &pic 16 /* INT A on slot 12 is irq 16 */ + 0x6000 0 0 IRQ_INTB &pic 13 /* INT B on slot 12 is irq 13 */ + 0x6000 0 0 IRQ_INTC &pic 14 /* INT C on slot 12 is irq 14 */ + 0x6000 0 0 IRQ_INTD &pic 15 /* INT D on slot 12 is irq 15 */ >; };
Documentation/devicetree/bindings/pci/versatile.txt +20 -20
@@ -36,24 +36,24 @@ pci-controller@10001000 { 0x02000000 0 0x50000000 0x50000000 0 0x10000000 /* non-prefetchable memory */ 0x42000000 0 0x60000000 0x60000000 0 0x10000000>; /* prefetchable memory */ - interrupt-map-mask = <0x1800 0 0 7>; - interrupt-map = <0x1800 0 0 1 &sic 28 - 0x1800 0 0 2 &sic 29 - 0x1800 0 0 3 &sic 30 - 0x1800 0 0 4 &sic 27 - - 0x1000 0 0 1 &sic 27 - 0x1000 0 0 2 &sic 28 - 0x1000 0 0 3 &sic 29 - 0x1000 0 0 4 &sic 30 - - 0x0800 0 0 1 &sic 30 - 0x0800 0 0 2 &sic 27 - 0x0800 0 0 3 &sic 28 - 0x0800 0 0 4 &sic 29 - - 0x0000 0 0 1 &sic 29 - 0x0000 0 0 2 &sic 30 - 0x0000 0 0 3 &sic 27 - 0x0000 0 0 4 &sic 28>; + interrupt-map-mask = <0x1800 0 0 IRQ_INT_ALL>; + interrupt-map = <0x1800 0 0 IRQ_INTA &sic 28 + 0x1800 0 0 IRQ_INTB &sic 29 + 0x1800 0 0 IRQ_INTC &sic 30 + 0x1800 0 0 IRQ_INTD &sic 27 + + 0x1000 0 0 IRQ_INTA &sic 27 + 0x1000 0 0 IRQ_INTB &sic 28 + 0x1000 0 0 IRQ_INTC &sic 29 + 0x1000 0 0 IRQ_INTD &sic 30 + + 0x0800 0 0 IRQ_INTA &sic 30 + 0x0800 0 0 IRQ_INTB &sic 27 + 0x0800 0 0 IRQ_INTC &sic 28 + 0x0800 0 0 IRQ_INTD &sic 29 + + 0x0000 0 0 IRQ_INTA &sic 29 + 0x0000 0 0 IRQ_INTB &sic 30 + 0x0000 0 0 IRQ_INTC &sic 27 + 0x0000 0 0 IRQ_INTD &sic 28>; };
Documentation/devicetree/bindings/pci/xgene-pci-msi.txt +5 -5
@@ -57,11 +57,11 @@ SoC DTSI: 0x02000000 0x00 0x80000000 0xe1 0x80000000 0x00 0x80000000>; /* mem */ dma-ranges = <0x42000000 0x80 0x00000000 0x80 0x00000000 0x00 0x80000000 0x42000000 0x00 0x00000000 0x00 0x00000000 0x80 0x00000000>; - interrupt-map-mask = <0x0 0x0 0x0 0x7>; - interrupt-map = <0x0 0x0 0x0 0x1 &gic 0x0 0xc2 0x1 - 0x0 0x0 0x0 0x2 &gic 0x0 0xc3 0x1 - 0x0 0x0 0x0 0x3 &gic 0x0 0xc4 0x1 - 0x0 0x0 0x0 0x4 &gic 0x0 0xc5 0x1>; + interrupt-map-mask = <0x0 0x0 0x0 IRQ_INT_ALL>; + interrupt-map = <0x0 0x0 0x0 IRQ_INTA &gic 0x0 0xc2 0x1 + 0x0 0x0 0x0 IRQ_INTB &gic 0x0 0xc3 0x1 + 0x0 0x0 0x0 IRQ_INTC &gic 0x0 0xc4 0x1 + 0x0 0x0 0x0 IRQ_INTD &gic 0x0 0xc5 0x1>; dma-coherent; clocks = <&pcie0clk 0>; msi-parent= <&msi>;
Documentation/devicetree/bindings/pci/xgene-pci.txt +5 -5
@@ -39,11 +39,11 @@ Example: 0x02000000 0x00 0x80000000 0xe1 0x80000000 0x00 0x80000000>; /* mem */ dma-ranges = <0x42000000 0x80 0x00000000 0x80 0x00000000 0x00 0x80000000 0x42000000 0x00 0x00000000 0x00 0x00000000 0x80 0x00000000>; - interrupt-map-mask = <0x0 0x0 0x0 0x7>; - interrupt-map = <0x0 0x0 0x0 0x1 &gic 0x0 0xc2 0x1 - 0x0 0x0 0x0 0x2 &gic 0x0 0xc3 0x1 - 0x0 0x0 0x0 0x3 &gic 0x0 0xc4 0x1 - 0x0 0x0 0x0 0x4 &gic 0x0 0xc5 0x1>; + interrupt-map-mask = <0x0 0x0 0x0 IRQ_INT_ALL>; + interrupt-map = <0x0 0x0 0x0 IRQ_INTA &gic 0x0 0xc2 0x1 + 0x0 0x0 0x0 IRQ_INTB &gic 0x0 0xc3 0x1 + 0x0 0x0 0x0 IRQ_INTC &gic 0x0 0xc4 0x1 + 0x0 0x0 0x0 IRQ_INTD &gic 0x0 0xc5 0x1>; dma-coherent; clocks = <&pcie0clk 0>; };
Documentation/devicetree/bindings/pci/xilinx-nwl-pcie.txt +5 -5
@@ -47,11 +47,11 @@ nwl_pcie: pcie@fd0e0000 { interrupt-parent = <&gic>; interrupts = <0 114 4>, <0 115 4>, <0 116 4>, <0 117 4>, <0 118 4>; interrupt-names = "msi0", "msi1", "intx", "dummy", "misc"; - interrupt-map-mask = <0x0 0x0 0x0 0x7>; - interrupt-map = <0x0 0x0 0x0 0x1 &pcie_intc 0x1>, - <0x0 0x0 0x0 0x2 &pcie_intc 0x2>, - <0x0 0x0 0x0 0x3 &pcie_intc 0x3>, - <0x0 0x0 0x0 0x4 &pcie_intc 0x4>; + interrupt-map-mask = <0x0 0x0 0x0 IRQ_INT_ALL>; + interrupt-map = <0x0 0x0 0x0 IRQ_INTA &pcie_intc 0x1>, + <0x0 0x0 0x0 IRQ_INTB &pcie_intc 0x2>, + <0x0 0x0 0x0 IRQ_INTC &pcie_intc 0x3>, + <0x0 0x0 0x0 IRQ_INTD &pcie_intc 0x4>; msi-parent = <&nwl_pcie>; reg = <0x0 0xfd0e0000 0x0 0x1000>,
Documentation/devicetree/bindings/pci/xilinx-pcie.txt +10 -10
@@ -47,11 +47,11 @@ Zynq: reg = < 0x50000000 0x1000000 >; device_type = "pci"; interrupts = < 0 52 4 >; - interrupt-map-mask = <0 0 0 7>; - interrupt-map = <0 0 0 1 &pcie_intc 1>, - <0 0 0 2 &pcie_intc 2>, - <0 0 0 3 &pcie_intc 3>, - <0 0 0 4 &pcie_intc 4>; + interrupt-map-mask = <0 0 0 IRQ_INT_ALL>; + interrupt-map = <0 0 0 IRQ_INTA &pcie_intc 1>, + <0 0 0 IRQ_INTB &pcie_intc 2>, + <0 0 0 IRQ_INTC &pcie_intc 3>, + <0 0 0 IRQ_INTD &pcie_intc 4>; ranges = < 0x02000000 0 0x60000000 0x60000000 0 0x10000000 >; pcie_intc: interrupt-controller {
@@ -72,11 +72,11 @@ Microblaze: device_type = "pci"; interrupt-parent = <µblaze_0_intc>; interrupts = <1 2>; - interrupt-map-mask = <0 0 0 7>; - interrupt-map = <0 0 0 1 &pcie_intc 1>, - <0 0 0 2 &pcie_intc 2>, - <0 0 0 3 &pcie_intc 3>, - <0 0 0 4 &pcie_intc 4>; + interrupt-map-mask = <0 0 0 IRQ_INT_ALL>; + interrupt-map = <0 0 0 IRQ_INTA &pcie_intc 1>, + <0 0 0 IRQ_INTB &pcie_intc 2>, + <0 0 0 IRQ_INTC &pcie_intc 3>, + <0 0 0 IRQ_INTD &pcie_intc 4>; ranges = <0x02000000 0x00000000 0x80000000 0x80000000 0x00000000 0x10000000>; pcie_intc: interrupt-controller {
Signature · 1 line
2.21.0
Re: [PATCH v1 7/7] dt-bindings: PCI: Use IRQ flags for legacy PCI IRQ interrupts
Hi Andrew,
thanks for your patch!
Quoted 4 lines · Andrew Murray
Replace magic numbers used to describe legacy PCI IRQ interrupts with #define.
Signed-off-by Andrew Murray <[email protected]>
When I add examples I usually make sure that above the examples are the appropriate #include files, this is becoming more important as we convert to yaml, then you need the right includes because the examples will get compiled.
With that taken into account:
Yours,
Linus Walleij
Re: [PATCH v1 7/7] dt-bindings: PCI: Use IRQ flags for legacy PCI IRQ interrupts
Quoted 3 lines · Linus Walleij
Hi Andrew,
thanks for your patch!
Thanks for the review.
Quoted 6 lines · Andrew Murray
Quoted 4 lines
Replace magic numbers used to describe legacy PCI IRQ interrupts with #define.
Quoted 6 lines
Quoted 1 line
Signed-off-by Andrew Murray <[email protected]>When I add examples I usually make sure that above the examples are the appropriate #include files, this is becoming more important as we convert to yaml, then you need the right includes because the examples will get compiled.
OK thanks - I can see other files in Documentation that take this approach I'll update this patch on my respin.
Thanks,
Andrew Murray
Quoted 6 lines
With that taken into account:
Reviewed-by Linus Walleij <[email protected]>Yours,
Linus Walleij
Rob Herring
maintainerRe: [PATCH v1 7/7] dt-bindings: PCI: Use IRQ flags for legacy PCI IRQ interrupts
Quoted 15 lines · Andrew Murray
Quoted 3 lines · Linus Walleij
Hi Andrew,
thanks for your patch!
Thanks for the review.
Quoted 8 lines · Andrew Murray
Quoted 5 lines
Replace magic numbers used to describe legacy PCI IRQ interrupts with #define.
Signed-off-by Andrew Murray <[email protected]>
Quoted 7 lines
Quoted 4 lines
When I add examples I usually make sure that above the examples are the appropriate #include files, this is becoming more important as we convert to yaml, then you need the right includes because the examples will get compiled.
OK thanks - I can see other files in Documentation that take this approach I'll update this patch on my respin.
FYI, It's been on my todo to add common includes like irq.h and gpio.h to the example template used to compile the examples, so everyone doesn't have to add them.
Rob
Re: [PATCH v1 7/7] dt-bindings: PCI: Use IRQ flags for legacy PCI IRQ interrupts
In reply to Andrew MurrayQuoted 25 lines · Andrew Murray
Replace magic numbers used to describe legacy PCI IRQ interrupts with #define.
Signed-off-by Andrew Murray <[email protected]>--- .../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 +--
Quoted 9 lines
.../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 +++--- 27 files changed, 224 insertions(+), 224 deletions(-)