Skip to content

Commit a7c7116

Browse files
Felix Zengrkhuangtao
authored andcommitted
driver: rknpu: Fix probe failed due to missing interrupt names in DTS in kernel 6.10
Signed-off-by: Felix Zeng <felix.zeng@rock-chips.com> Change-Id: Ie109c814b0c4f3e6b6ddc0c6e12fd58a2e645036
1 parent ce595e7 commit a7c7116

File tree

1 file changed

+0
-22
lines changed

1 file changed

+0
-22
lines changed

drivers/rknpu/rknpu_drv.c

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1633,12 +1633,9 @@ static int rknpu_register_irq(struct platform_device *pdev,
16331633
{
16341634
const struct rknpu_config *config = rknpu_dev->config;
16351635
struct device *dev = &pdev->dev;
1636-
#if KERNEL_VERSION(6, 1, 0) > LINUX_VERSION_CODE
16371636
struct resource *res;
1638-
#endif
16391637
int i, ret, irq;
16401638

1641-
#if KERNEL_VERSION(6, 1, 0) > LINUX_VERSION_CODE
16421639
res = platform_get_resource_byname(pdev, IORESOURCE_IRQ,
16431640
config->irqs[0].name);
16441641
if (res) {
@@ -1677,25 +1674,6 @@ static int rknpu_register_irq(struct platform_device *pdev,
16771674
return ret;
16781675
}
16791676
}
1680-
#else
1681-
/* there are irq names in dts */
1682-
for (i = 0; i < config->num_irqs; i++) {
1683-
irq = platform_get_irq_byname(pdev, config->irqs[i].name);
1684-
if (irq < 0) {
1685-
LOG_DEV_ERROR(dev, "no npu %s in dts\n",
1686-
config->irqs[i].name);
1687-
return irq;
1688-
}
1689-
1690-
ret = devm_request_irq(dev, irq, config->irqs[i].irq_hdl,
1691-
IRQF_SHARED, dev_name(dev), rknpu_dev);
1692-
if (ret < 0) {
1693-
LOG_DEV_ERROR(dev, "request %s failed: %d\n",
1694-
config->irqs[i].name, ret);
1695-
return ret;
1696-
}
1697-
}
1698-
#endif
16991677

17001678
return 0;
17011679
}

0 commit comments

Comments
 (0)