mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-16 15:34:48 +08:00
i2c: sh_mobile: Use platform_get_irq_optional() 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_optional() for DT users only. Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Tested-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Signed-off-by: Wolfram Sang <wsa@kernel.org>
This commit is contained in:
parent
c3b2f911ac
commit
aab799e44c
@ -830,20 +830,38 @@ static void sh_mobile_i2c_release_dma(struct sh_mobile_i2c_data *pd)
|
||||
|
||||
static int sh_mobile_i2c_hook_irqs(struct platform_device *dev, struct sh_mobile_i2c_data *pd)
|
||||
{
|
||||
struct resource *res;
|
||||
resource_size_t n;
|
||||
struct device_node *np = dev_of_node(&dev->dev);
|
||||
int k = 0, ret;
|
||||
|
||||
while ((res = platform_get_resource(dev, IORESOURCE_IRQ, k))) {
|
||||
for (n = res->start; n <= res->end; n++) {
|
||||
ret = devm_request_irq(&dev->dev, n, sh_mobile_i2c_isr,
|
||||
0, dev_name(&dev->dev), pd);
|
||||
if (np) {
|
||||
int irq;
|
||||
|
||||
while ((irq = platform_get_irq_optional(dev, k)) != -ENXIO) {
|
||||
if (irq < 0)
|
||||
return irq;
|
||||
ret = devm_request_irq(&dev->dev, irq, sh_mobile_i2c_isr,
|
||||
0, dev_name(&dev->dev), pd);
|
||||
if (ret) {
|
||||
dev_err(&dev->dev, "cannot request IRQ %pa\n", &n);
|
||||
dev_err(&dev->dev, "cannot request IRQ %d\n", irq);
|
||||
return ret;
|
||||
}
|
||||
k++;
|
||||
};
|
||||
} else {
|
||||
struct resource *res;
|
||||
resource_size_t n;
|
||||
|
||||
while ((res = platform_get_resource(dev, IORESOURCE_IRQ, k))) {
|
||||
for (n = res->start; n <= res->end; n++) {
|
||||
ret = devm_request_irq(&dev->dev, n, sh_mobile_i2c_isr,
|
||||
0, dev_name(&dev->dev), pd);
|
||||
if (ret) {
|
||||
dev_err(&dev->dev, "cannot request IRQ %pa\n", &n);
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
k++;
|
||||
}
|
||||
k++;
|
||||
}
|
||||
|
||||
return k > 0 ? 0 : -ENOENT;
|
||||
|
Loading…
Reference in New Issue
Block a user