From: Andrew Murray <andrew.murray@arm.com>
To: Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Chris Zankel <chris@zankel.net>,
Max Filippov <jcmvbkbc@gmail.com>
Cc: devicetree@vger.kernel.org, linux-xtensa@linux-xtensa.org
Subject: [PATCH v1 4/7] xtensa: dts: Use IRQ flags for legacy PCI IRQ interrupts
Date: Mon, 4 Nov 2019 16:38:18 +0000 [thread overview]
Message-ID: <20191104163834.8932-5-andrew.murray@arm.com> (raw)
In-Reply-To: <20191104163834.8932-1-andrew.murray@arm.com>
Replace magic numbers used to describe legacy PCI IRQ interrupts
with #define.
Signed-off-by: Andrew Murray <andrew.murray@arm.com>
---
arch/xtensa/boot/dts/virt.dts | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/arch/xtensa/boot/dts/virt.dts b/arch/xtensa/boot/dts/virt.dts
index 611b98a02a65..14e9a7beac2d 100644
--- a/arch/xtensa/boot/dts/virt.dts
+++ b/arch/xtensa/boot/dts/virt.dts
@@ -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>;
};
};
--
2.21.0
next prev parent reply other threads:[~2019-11-04 16:39 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-04 16:38 [PATCH v1 0/7] PCI: dt: Remove magic numbers for legacy PCI IRQ interrupts Andrew Murray
2019-11-04 16:38 ` [PATCH v1 1/7] PCI: dt: Add legacy PCI IRQ defines Andrew Murray
2019-11-06 23:43 ` Rob Herring
2019-11-04 16:38 ` [PATCH v1 2/7] arm64: dts: Use IRQ flags for legacy PCI IRQ interrupts Andrew Murray
2019-11-06 10:03 ` Liviu Dudau
2019-11-08 14:34 ` Heiko Stuebner
2019-11-09 6:03 ` Wei Xu
2019-11-04 16:38 ` [PATCH v1 3/7] arm: " Andrew Murray
2019-11-05 15:06 ` Linus Walleij
2019-11-05 17:20 ` Jesper Nilsson
2019-11-04 16:38 ` Andrew Murray [this message]
2019-11-04 16:38 ` [PATCH v1 5/7] powerpc: dts: fsl: " Andrew Murray
2019-11-12 12:48 ` Michael Ellerman
2019-11-04 16:38 ` [PATCH v1 6/7] powerpc: dts: " Andrew Murray
2019-11-12 12:48 ` Michael Ellerman
2019-11-04 16:38 ` [PATCH v1 7/7] dt-bindings: PCI: " Andrew Murray
2019-11-06 23:47 ` Rob Herring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191104163834.8932-5-andrew.murray@arm.com \
--to=andrew.murray@arm.com \
--cc=chris@zankel.net \
--cc=devicetree@vger.kernel.org \
--cc=jcmvbkbc@gmail.com \
--cc=linux-xtensa@linux-xtensa.org \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).