diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2022-05-19 11:01:56 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-19 11:01:56 -0300 |
| commit | 38955ef654554c94f4d91bafb9ef5c5f41a4c0f6 (patch) | |
| tree | 0eae305c6314b6c4ff1bc523c95f246d2804fb0c /drivers/rpmsg/imx_rpmsg.c | |
| parent | 712fcc850e5a6d0867b0d97a0b79f1addd01998f (diff) | |
| parent | c4bda7fe18b3ff6898f8fa110a3d60ee8f4379a0 (diff) | |
Merge pull request #564 from philschenker/update-to-2.3.7__5.4-2.3.x-imx
Update Kernel 5.4-2.3.x-imx to NXP Release Linux 5.4.70_2.3.7 Patch
Diffstat (limited to 'drivers/rpmsg/imx_rpmsg.c')
| -rw-r--r-- | drivers/rpmsg/imx_rpmsg.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/rpmsg/imx_rpmsg.c b/drivers/rpmsg/imx_rpmsg.c index 9dd704ae5a64..b93df26bd21b 100644 --- a/drivers/rpmsg/imx_rpmsg.c +++ b/drivers/rpmsg/imx_rpmsg.c @@ -61,8 +61,6 @@ struct imx_rpmsg_vproc { struct platform_device *pdev; }; -#define SC_IRQ_GROUP_REBOOTED 5U /* Partition reboot complete */ - /* * The time consumption by remote ready is less than 1ms in the * evaluation. Set the max wait timeout as 50ms here. @@ -418,7 +416,7 @@ static int imx_rpmsg_partition_notify(struct notifier_block *nb, /* Ignore other irqs */ if (!((event & BIT(rpdev->mub_partition)) && - (*(u8 *)group == SC_IRQ_GROUP_REBOOTED))) + (*(u8 *)group == IMX_SC_IRQ_GROUP_REBOOTED))) return 0; imx_rpmsg_restore(rpdev); @@ -618,7 +616,7 @@ static int imx_rpmsg_probe(struct platform_device *pdev) &rpdev->mub_partition)) rpdev->mub_partition = 3; /* default partition 3 */ - ret = imx_scu_irq_group_enable(SC_IRQ_GROUP_REBOOTED, + ret = imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED, BIT(rpdev->mub_partition), true); if (ret) { @@ -628,7 +626,7 @@ static int imx_rpmsg_probe(struct platform_device *pdev) ret = imx_scu_irq_register_notifier(&rpdev->proc_nb); if (ret) { - imx_scu_irq_group_enable(SC_IRQ_GROUP_REBOOTED, + imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED, BIT(rpdev->mub_partition), false); dev_warn(&pdev->dev, "reqister scu notifier failed.\n"); |