From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from metis.ext.pengutronix.de ([92.198.50.35]:33543 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754321AbaCEN0g (ORCPT ); Wed, 5 Mar 2014 08:26:36 -0500 From: Lucas Stach To: linux-arm-kernel@lists.infradead.org Cc: linux-sh@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-tegra@vger.kernel.org, linux-pci@vger.kernel.org, devicetree@vger.kernel.org, Jingoo Han , Bjorn Helgaas , Simon Horman , Shawn Guo , Stephen Warren , Ben Dooks , Kukjin Kim , Thierry Reding , Arnd Bergmann , kernel@pengutronix.de Subject: [PATCH v2 3/6] PCI: rcar: use new OF interrupt mapping when possible Date: Wed, 5 Mar 2014 14:25:48 +0100 Message-Id: <1394025951-32438-4-git-send-email-l.stach@pengutronix.de> In-Reply-To: <1394025951-32438-1-git-send-email-l.stach@pengutronix.de> References: <1394025951-32438-1-git-send-email-l.stach@pengutronix.de> Sender: linux-pci-owner@vger.kernel.org List-ID: 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 | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/pci/host/pci-rcar-gen2.c b/drivers/pci/host/pci-rcar-gen2.c index ceec147baec3..3a0914163ad0 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 @@ -160,8 +161,13 @@ static int __init 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; } /* PCI host controller setup */ @@ -249,6 +255,8 @@ static int __init rcar_pci_add_controller(struct rcar_pci_priv *priv) void **private_data; int count; + pci_common_init_dev(priv->dev, &rcar_hw_pci); + if (rcar_hw_pci.nr_controllers < rcar_pci_count) goto add_priv; @@ -322,8 +330,6 @@ static int __init rcar_pci_init(void) int retval; retval = platform_driver_probe(&rcar_pci_driver, rcar_pci_probe); - if (!retval) - pci_common_init(&rcar_hw_pci); /* Private data pointer array is not needed any more */ kfree(rcar_hw_pci.private_data); -- 1.9.0