RZ/G2L has separate IRQ lines for receive FIFO and global error interrupt
whereas R-Car has combined IRQ line.
Add multi_global_irqs to struct rcar_canfd_hw_info to select the driver to
choose between combined and separate irq registration for global
interrupts.
Signed-off-by: Biju Das <biju.das.jz@xxxxxxxxxxxxxx>
---
drivers/net/can/rcar/rcar_canfd.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/net/can/rcar/rcar_canfd.c b/drivers/net/can/rcar/rcar_canfd.c
index ecd7c0df2ded..0d131694c241 100644
--- a/drivers/net/can/rcar/rcar_canfd.c
+++ b/drivers/net/can/rcar/rcar_canfd.c
@@ -526,6 +526,8 @@ struct rcar_canfd_global;
struct rcar_canfd_hw_info {
enum rcanfd_chip_id chip_id;
u32 max_channels;
+ /* hardware features */
+ unsigned multi_global_irqs:1; /* Has multiple global irqs */
};
/* Channel priv data */
@@ -603,6 +605,7 @@ static const struct rcar_canfd_hw_info rcar_gen3_hw_info = {
static const struct rcar_canfd_hw_info rzg2l_hw_info = {
.chip_id = RENESAS_RZG2L,
.max_channels = 2,
+ .multi_global_irqs = 1,
};
static const struct rcar_canfd_hw_info r8a779a0_hw_info = {
@@ -1874,7 +1877,7 @@ static int rcar_canfd_probe(struct platform_device *pdev)
of_node_put(of_child);
}
- if (info->chip_id != RENESAS_RZG2L) {
+ if (!info->multi_global_irqs) {
ch_irq = platform_get_irq_byname_optional(pdev, "ch_int");
if (ch_irq < 0) {
/* For backward compatibility get irq by index */
@@ -1957,7 +1960,7 @@ static int rcar_canfd_probe(struct platform_device *pdev)
gpriv->base = addr;
/* Request IRQ that's common for both channels */
- if (info->chip_id != RENESAS_RZG2L) {
+ if (!info->multi_global_irqs) {
err = devm_request_irq(&pdev->dev, ch_irq,
rcar_canfd_channel_interrupt, 0,
"canfd.ch_int", gpriv);
--
2.25.1
