From patchwork Mon Apr 7 09:30:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Stach X-Patchwork-Id: 337429 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id B22A91400D3 for ; Mon, 7 Apr 2014 19:30:27 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754636AbaDGJa0 (ORCPT ); Mon, 7 Apr 2014 05:30:26 -0400 Received: from metis.ext.pengutronix.de ([92.198.50.35]:59077 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754182AbaDGJa0 (ORCPT ); Mon, 7 Apr 2014 05:30:26 -0400 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 1WX5sk-0001f4-67; Mon, 07 Apr 2014 11:30:22 +0200 From: Lucas Stach To: Bjorn Helgaas Cc: Arnd Bergmann , linux-sh@vger.kernel.org, linux-pci@vger.kernel.org, Simon Horman , Ben Dooks , kernel@pengutronix.de, linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 rebased] PCI: rcar: use new OF interrupt mapping when possible Date: Mon, 7 Apr 2014 11:30:20 +0200 Message-Id: <1396863020-21880-1-git-send-email-l.stach@pengutronix.de> X-Mailer: git-send-email 1.9.1 In-Reply-To: <20140404170103.GF9007@google.com> References: <20140404170103.GF9007@google.com> 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-pci@vger.kernel.org Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org This is the recommended method of doing the IRQ mapping. Still fall back to the old method in order to not break the just submitted board files. Signed-off-by: Lucas Stach --- v2: pass in parent device to pci_common_init(), to make DT parsing work. --- drivers/pci/host/pci-rcar-gen2.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/pci/host/pci-rcar-gen2.c b/drivers/pci/host/pci-rcar-gen2.c index fd3e3ab56509..4fe349dcaf59 100644 --- a/drivers/pci/host/pci-rcar-gen2.c +++ b/drivers/pci/host/pci-rcar-gen2.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -180,8 +181,13 @@ static int rcar_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) { struct pci_sys_data *sys = dev->bus->sysdata; struct rcar_pci_priv *priv = sys->private_data; + int irq; + + irq = of_irq_parse_and_map_pci(dev, slot, pin); + if (!irq) + irq = priv->irq; - return priv->irq; + return irq; } #ifdef CONFIG_PCI_DEBUG