Skip to content

Commit

Permalink
ASoC: bcm: Use platform_get_irq() to get the interrupt
Browse files Browse the repository at this point in the history
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: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Link: https://lore.kernel.org/r/20211221170100.27423-3-prabhakar.mahadev-lad.rj@bp.renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Lad Prabhakar authored and Mark Brown committed Dec 21, 2021
1 parent c2efaf8 commit 5de035c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
1 change: 0 additions & 1 deletion sound/soc/bcm/bcm63xx-i2s.h
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@

struct bcm_i2s_priv {
struct device *dev;
struct resource *r_irq;
struct regmap *regmap_i2s;
struct clk *i2s_clk;
struct snd_pcm_substream *play_substream;
Expand Down
13 changes: 6 additions & 7 deletions sound/soc/bcm/bcm63xx-pcm-whistler.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

#include <linux/dma-mapping.h>
#include <linux/io.h>
#include <linux/irq.h>
#include <linux/module.h>
#include <sound/pcm_params.h>
#include <linux/regmap.h>
Expand Down Expand Up @@ -387,14 +388,12 @@ int bcm63xx_soc_platform_probe(struct platform_device *pdev,
{
int ret;

i2s_priv->r_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
if (!i2s_priv->r_irq) {
dev_err(&pdev->dev, "Unable to get register irq resource.\n");
return -ENODEV;
}
ret = platform_get_irq(pdev, 0);
if (ret < 0)
return ret;

ret = devm_request_irq(&pdev->dev, i2s_priv->r_irq->start, i2s_dma_isr,
i2s_priv->r_irq->flags, "i2s_dma", (void *)i2s_priv);
ret = devm_request_irq(&pdev->dev, ret, i2s_dma_isr,
irq_get_trigger_type(ret), "i2s_dma", (void *)i2s_priv);
if (ret) {
dev_err(&pdev->dev,
"i2s_init: failed to request interrupt.ret=%d\n", ret);
Expand Down

0 comments on commit 5de035c

Please sign in to comment.