From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bjorn Helgaas Subject: Re: [PATCH v2 3/6] PCI: rcar: use new OF interrupt mapping when possible Date: Fri, 4 Apr 2014 11:01:03 -0600 Message-ID: <20140404170103.GF9007@google.com> References: <1394025951-32438-1-git-send-email-l.stach@pengutronix.de> <1394025951-32438-4-git-send-email-l.stach@pengutronix.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <1394025951-32438-4-git-send-email-l.stach-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> Sender: linux-tegra-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Lucas Stach Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-sh-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-pci-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Jingoo Han , Simon Horman , Shawn Guo , Stephen Warren , Ben Dooks , Kukjin Kim , Thierry Reding , Arnd Bergmann , kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org List-Id: devicetree@vger.kernel.org On Wed, Mar 05, 2014 at 02:25:48PM +0100, Lucas Stach wrote: > 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. Hi Lucas, can you rebase this to Linus' current tree? This doesn't apply anymore because of conflicts with 546cadda3575 ("PCI: rcar: Register each instance independently"). Thanks! > 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 >