On Wednesday, March 05, 2014 10:26 PM, Lucas Stach wrote:
>
> This is the recommended method of doing the IRQ
> mapping. For old devicetrees we fall back to the
> previous practice.
>
> Signed-off-by: Lucas Stach <l.stach@xxxxxxxxxxxxxx>
> Acked-by: Arnd Bergmann <arnd@xxxxxxxx>
(+cc Mohit KUMAR, Richard Zhu, Pratyush Anand, Marek Vasut,
Kishon Vijay Abraham I)
Acked-by: Jingoo Han <jg1.han@xxxxxxxxxxx>
It works properly on Exynos platform.
Thank you.
Best regards,
Jingoo Han
> ---
> v2: pass in parent dev to relevant functions, to make DT parsing
> work (spotted by Tim Harvey <tharvey@xxxxxxxxxxxxx>)
> ---
> drivers/pci/host/pcie-designware.c | 12 +++++++++---
> 1 file changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c
> index 17ce88f79d2b..98c118e04dba 100644
> --- a/drivers/pci/host/pcie-designware.c
> +++ b/drivers/pci/host/pcie-designware.c
> @@ -17,6 +17,7 @@
> #include <linux/module.h>
> #include <linux/msi.h>
> #include <linux/of_address.h>
> +#include <linux/of_pci.h>
> #include <linux/pci.h>
> #include <linux/pci_regs.h>
> #include <linux/types.h>
> @@ -492,7 +493,7 @@ int __init dw_pcie_host_init(struct pcie_port *pp)
> dw_pci.nr_controllers = 1;
> dw_pci.private_data = (void **)&pp;
>
> - pci_common_init(&dw_pci);
> + pci_common_init_dev(pp->dev, &dw_pci);
> pci_assign_unassigned_resources();
> #ifdef CONFIG_PCI_DOMAINS
> dw_pci.domain++;
> @@ -725,7 +726,7 @@ static struct pci_bus *dw_pcie_scan_bus(int nr, struct pci_sys_data *sys)
>
> if (pp) {
> pp->root_bus_nr = sys->busnr;
> - bus = pci_scan_root_bus(NULL, sys->busnr, &dw_pcie_ops,
> + bus = pci_scan_root_bus(pp->dev, sys->busnr, &dw_pcie_ops,
> sys, &sys->resources);
> } else {
> bus = NULL;
> @@ -738,8 +739,13 @@ static struct pci_bus *dw_pcie_scan_bus(int nr, struct pci_sys_data *sys)
> static int dw_pcie_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
> {
> struct pcie_port *pp = sys_to_pcie(dev->bus->sysdata);
> + int irq;
>
> - return pp->irq;
> + irq = of_irq_parse_and_map_pci(dev, slot, pin);
> + if (!irq)
> + irq = pp->irq;
> +
> + return irq;
> }
>
> static void dw_pcie_add_bus(struct pci_bus *bus)
> --
> 1.9.0
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
