From patchwork Fri Feb 28 17:30:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Stach X-Patchwork-Id: 3743691 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 2CF51BF13A for ; Fri, 28 Feb 2014 18:01:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 624252026F for ; Fri, 28 Feb 2014 18:01:19 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0FEFE201DC for ; Fri, 28 Feb 2014 18:01:18 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WJRJ5-0006b7-AS; Fri, 28 Feb 2014 17:33:08 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WJRIL-0007K5-RF; Fri, 28 Feb 2014 17:32:21 +0000 Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WJRH4-0007C4-4p for linux-arm-kernel@lists.infradead.org; Fri, 28 Feb 2014 17:31:06 +0000 Received: from dude.hi.pengutronix.de ([10.1.0.7] helo=dude.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1WJRGb-0003QV-FW; Fri, 28 Feb 2014 18:30:33 +0100 From: Lucas Stach To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/3] ARM: dts: imx6: extend PCIe interrupt list for MSI Date: Fri, 28 Feb 2014 18:30:31 +0100 Message-Id: <1393608633-18321-2-git-send-email-l.stach@pengutronix.de> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1393608633-18321-1-git-send-email-l.stach@pengutronix.de> References: <1393608633-18321-1-git-send-email-l.stach@pengutronix.de> X-SA-Exim-Connect-IP: 10.1.0.7 X-SA-Exim-Mail-From: l.stach@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140228_123102_646448_A901C2DE X-CRM114-Status: GOOD ( 13.22 ) X-Spam-Score: -1.9 (-) Cc: Richard Zhu , Mark Rutland , linux-pci@vger.kernel.org, kernel@pengutronix.de, Bjorn Helgaas , Shawn Guo X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Optional IRQ necessary for handling MSI. Signed-off-by: Juergen Beisert Signed-off-by: Lucas Stach --- 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 = , + ; + 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 = , + ; + interrupt-names = "inta", "msi"; #interrupt-cells = <1>; interrupt-map-mask = <0 0 0 0x7>;