Message ID | 20211220010411.12075-6-prabhakar.mahadev-lad.rj@bp.renesas.com (mailing list archive) |
---|---|
State | Awaiting Upstream |
Delegated to: | Geert Uytterhoeven |
Headers | show |
Series | usb: sound/soc: Use platform_get_irq*() variants to fetch IRQ's | expand |
On 20/12/2021 03:04, Lad Prabhakar wrote: > platform_get_resource_byname(pdev, IORESOURCE_IRQ, ..) relies on static > allocation of IRQ resources in DT core code, this causes an issue > when using hierarchical interrupt domains using "interrupts" property > in the node as this bypasses the hierarchical setup and messes up the > irq chaining. > > In preparation for removal of static setup of IRQ resource from DT core > code use platform_get_irq_byname(). > > Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> > --- > drivers/usb/cdns3/cdns3-plat.c | 14 ++++++++------ > 1 file changed, 8 insertions(+), 6 deletions(-) > > diff --git a/drivers/usb/cdns3/cdns3-plat.c b/drivers/usb/cdns3/cdns3-plat.c > index 4d0f027e5bd3..dc068e940ed5 100644 > --- a/drivers/usb/cdns3/cdns3-plat.c > +++ b/drivers/usb/cdns3/cdns3-plat.c > @@ -13,6 +13,7 @@ > */ > > #include <linux/module.h> > +#include <linux/irq.h> > #include <linux/kernel.h> > #include <linux/platform_device.h> > #include <linux/pm_runtime.h> > @@ -65,13 +66,14 @@ static int cdns3_plat_probe(struct platform_device *pdev) > > platform_set_drvdata(pdev, cdns); > > - res = platform_get_resource_byname(pdev, IORESOURCE_IRQ, "host"); > - if (!res) { > - dev_err(dev, "missing host IRQ\n"); > - return -ENODEV; > - } > + ret = platform_get_irq_byname(pdev, "host"); > + if (ret < 0) > + return ret; > > - cdns->xhci_res[0] = *res; > + cdns->xhci_res[0].start = ret; > + cdns->xhci_res[0].end = ret; > + cdns->xhci_res[0].flags = IORESOURCE_IRQ | irq_get_trigger_type(ret); > + cdns->xhci_res[0].name = "host"; > > res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "xhci"); > if (!res) { > Reviewed-by: Roger Quadros <rogerq@kernel.org> -- cheers, -roger
diff --git a/drivers/usb/cdns3/cdns3-plat.c b/drivers/usb/cdns3/cdns3-plat.c index 4d0f027e5bd3..dc068e940ed5 100644 --- a/drivers/usb/cdns3/cdns3-plat.c +++ b/drivers/usb/cdns3/cdns3-plat.c @@ -13,6 +13,7 @@ */ #include <linux/module.h> +#include <linux/irq.h> #include <linux/kernel.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> @@ -65,13 +66,14 @@ static int cdns3_plat_probe(struct platform_device *pdev) platform_set_drvdata(pdev, cdns); - res = platform_get_resource_byname(pdev, IORESOURCE_IRQ, "host"); - if (!res) { - dev_err(dev, "missing host IRQ\n"); - return -ENODEV; - } + ret = platform_get_irq_byname(pdev, "host"); + if (ret < 0) + return ret; - cdns->xhci_res[0] = *res; + cdns->xhci_res[0].start = ret; + cdns->xhci_res[0].end = ret; + cdns->xhci_res[0].flags = IORESOURCE_IRQ | irq_get_trigger_type(ret); + cdns->xhci_res[0].name = "host"; res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "xhci"); if (!res) {
platform_get_resource_byname(pdev, IORESOURCE_IRQ, ..) relies on static allocation of IRQ resources in DT core code, this causes an issue when using hierarchical interrupt domains using "interrupts" property in the node as this bypasses the hierarchical setup and messes up the irq chaining. In preparation for removal of static setup of IRQ resource from DT core code use platform_get_irq_byname(). Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> --- drivers/usb/cdns3/cdns3-plat.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)