Commit 5de035c2 authored by Lad Prabhakar's avatar Lad Prabhakar Committed by Mark Brown

ASoC: bcm: Use platform_get_irq() to get the interrupt

platform_get_resource(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().

While at it also drop "r_irq" member from struct bcm_i2s_priv as there
are no users of it.
Signed-off-by: default avatarLad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Link: https://lore.kernel.org/r/20211221170100.27423-3-prabhakar.mahadev-lad.rj@bp.renesas.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent c2efaf8f
...@@ -74,7 +74,6 @@ ...@@ -74,7 +74,6 @@
struct bcm_i2s_priv { struct bcm_i2s_priv {
struct device *dev; struct device *dev;
struct resource *r_irq;
struct regmap *regmap_i2s; struct regmap *regmap_i2s;
struct clk *i2s_clk; struct clk *i2s_clk;
struct snd_pcm_substream *play_substream; struct snd_pcm_substream *play_substream;
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/irq.h>
#include <linux/module.h> #include <linux/module.h>
#include <sound/pcm_params.h> #include <sound/pcm_params.h>
#include <linux/regmap.h> #include <linux/regmap.h>
...@@ -387,14 +388,12 @@ int bcm63xx_soc_platform_probe(struct platform_device *pdev, ...@@ -387,14 +388,12 @@ int bcm63xx_soc_platform_probe(struct platform_device *pdev,
{ {
int ret; int ret;
i2s_priv->r_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0); ret = platform_get_irq(pdev, 0);
if (!i2s_priv->r_irq) { if (ret < 0)
dev_err(&pdev->dev, "Unable to get register irq resource.\n"); return ret;
return -ENODEV;
}
ret = devm_request_irq(&pdev->dev, i2s_priv->r_irq->start, i2s_dma_isr, ret = devm_request_irq(&pdev->dev, ret, i2s_dma_isr,
i2s_priv->r_irq->flags, "i2s_dma", (void *)i2s_priv); irq_get_trigger_type(ret), "i2s_dma", (void *)i2s_priv);
if (ret) { if (ret) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"i2s_init: failed to request interrupt.ret=%d\n", ret); "i2s_init: failed to request interrupt.ret=%d\n", ret);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment