From patchwork Thu Feb 27 16:41:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Stach X-Patchwork-Id: 3734661 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 494AE9F35F for ; Thu, 27 Feb 2014 16:43:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6D9DA20220 for ; Thu, 27 Feb 2014 16:43:15 +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 7AE17201BA for ; Thu, 27 Feb 2014 16:43:14 +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 1WJ42i-0005Ll-TV; Thu, 27 Feb 2014 16:42:41 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WJ42X-0004Qg-9a; Thu, 27 Feb 2014 16:42:29 +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 1WJ42J-0004OP-CR for linux-arm-kernel@lists.infradead.org; Thu, 27 Feb 2014 16:42:16 +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 1WJ41r-00082T-1V; Thu, 27 Feb 2014 17:41:47 +0100 From: Lucas Stach To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 2/3] ARM: dts: imx6: extend PCIe interrupt list for MSI Date: Thu, 27 Feb 2014 17:41:44 +0100 Message-Id: <1393519305-15128-2-git-send-email-l.stach@pengutronix.de> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1393519305-15128-1-git-send-email-l.stach@pengutronix.de> References: <1393519305-15128-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-20140227_114215_825992_252AAE7C X-CRM114-Status: GOOD ( 13.37 ) X-Spam-Score: -1.9 (-) Cc: Richard Zhu , devicetree@vger.kernel.org, linux-pci@vger.kernel.org, kernel@pengutronix.de, Bjorn Helgaas , Mark Rutland , 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 Add optional irqs, necessary for MSI handling. Signed-off-by: Juergen Beisert Signed-off-by: Lucas Stach --- Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt | 10 +++++++++- arch/arm/boot/dts/imx6qdl.dtsi | 3 ++- 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 aade8d29314c..3b27ec310ec4 100644 --- a/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt +++ b/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt @@ -16,6 +16,13 @@ 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" + - "intb" + - "intc" + - "intd/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 @@ -32,7 +39,8 @@ Example: 0x81000000 0 0 0x01f80000 0 0x00010000 0x82000000 0 0x01000000 0x01000000 0 0x00f00000>; num-lanes = <1>; - interrupts = <0 123 0x04>; + interrupt-names = "inta", "intb", "intc", "intd/msi"; + interrupts = <0 123 0x04>, <0 122 0x04>, <0 121 0x04>, <0 120 0x04>; clocks = <&clks 189>, <&clks 187>, <&clks 206>, <&clks 144>; clock-names = "pcie_ref_125m", "sata_ref_100m", "lvds_gate", "pcie_axi"; }; diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi index fb28b2ecb1db..e0261dd3fdd3 100644 --- a/arch/arm/boot/dts/imx6qdl.dtsi +++ b/arch/arm/boot/dts/imx6qdl.dtsi @@ -126,7 +126,8 @@ 0x81000000 0 0 0x01f80000 0 0x00010000 /* downstream I/O */ 0x82000000 0 0x01000000 0x01000000 0 0x00f00000>; /* non-prefetchable memory */ num-lanes = <1>; - interrupts = <0 123 0x04>; + interrupt-names = "inta", "intb", "intc", "intd/msi"; + interrupts = <0 123 0x04>, <0 122 0x04>, <0 121 0x04>, <0 120 0x04>; clocks = <&clks 189>, <&clks 187>, <&clks 206>, <&clks 144>; clock-names = "pcie_ref_125m", "sata_ref_100m", "lvds_gate", "pcie_axi"; status = "disabled";