From: Lucas Stach <l.stach@pengutronix.de>
To: linux-arm-kernel@lists.infradead.org
Cc: linux-pci@vger.kernel.org, Richard Zhu <r65037@freescale.com>,
Mark Rutland <mark.rutland@arm.com>,
Shawn Guo <shawn.guo@linaro.org>,
Bjorn Helgaas <bhelgaas@google.com>,
kernel@pengutronix.de
Subject: [PATCH 1/3] ARM: dts: imx6: extend PCIe interrupt list for MSI
Date: Fri, 28 Feb 2014 18:30:31 +0100 [thread overview]
Message-ID: <1393608633-18321-2-git-send-email-l.stach@pengutronix.de> (raw)
In-Reply-To: <1393608633-18321-1-git-send-email-l.stach@pengutronix.de>
Optional IRQ necessary for handling MSI.
Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt | 9 ++++++++-
arch/arm/boot/dts/imx6qdl.dtsi | 4 +++-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt b/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt
index 93fbfd62f13c..0515183a6d96 100644
--- a/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt
+++ b/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt
@@ -17,6 +17,11 @@ Required properties:
- "pcie_axi"
Optional properties:
+- interrupts: Must contain an entry for each entry in the
+ interrupt-names property.
+- interrupt-names: May include the following entries:
+ - "inta"
+ - "msi" if not present the driver won't be able to handle MSI
- power-on-gpio: gpio pin number of power-enable signal
- wake-up-gpio: gpio pin number of incoming wakeup signal
- disable-gpio: gpio pin number of outgoing rfkill/endpoint disable signal
@@ -34,7 +39,9 @@ Example:
0x82000000 0 0x01000000 0x01000000 0 0x00f00000>;
num-lanes = <1>;
- interrupts = <0 123 0x04>;
+ interrupts = <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "inta", "msi";
#interrupt-cells = <1>;
interrupt-map-mask = <0 0 0 0x7>;
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index db3339e7d3a2..a3a3acd90964 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -129,7 +129,9 @@
0x82000000 0 0x01000000 0x01000000 0 0x00f00000>; /* non-prefetchable memory */
num-lanes = <1>;
- interrupts = <0 123 0x04>;
+ interrupts = <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "inta", "msi";
#interrupt-cells = <1>;
interrupt-map-mask = <0 0 0 0x7>;
--
1.8.5.3
next prev parent reply other threads:[~2014-02-28 17:30 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-28 17:30 [PATCH 0/3] i.MX6 MSI support Lucas Stach
2014-02-28 17:30 ` Lucas Stach [this message]
2014-03-03 5:22 ` [PATCH 1/3] ARM: dts: imx6: extend PCIe interrupt list for MSI Shawn Guo
2014-02-28 17:30 ` [PATCH 2/3] PCI: designware: make MSI isr shared irq aware Lucas Stach
2014-02-28 17:30 ` [PATCH 3/3] PCI: imx6: add support for MSI Lucas Stach
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=1393608633-18321-2-git-send-email-l.stach@pengutronix.de \
--to=l.stach@pengutronix.de \
--cc=bhelgaas@google.com \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-pci@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=r65037@freescale.com \
--cc=shawn.guo@linaro.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).