diff options
author | Philippe Schenker <philippe.schenker@toradex.com> | 2022-05-19 16:29:13 +0200 |
---|---|---|
committer | Philippe Schenker <philippe.schenker@toradex.com> | 2022-05-19 16:29:13 +0200 |
commit | e6fb5c32f78f99682821f91b3959e222c93e4cb9 (patch) | |
tree | 3f6c281a7d83a6e3c0a153f93718f7cd9a39b6f7 /drivers/rpmsg/imx_rpmsg.c | |
parent | 585dc27c53b6c1a32a7e11b724e91d7297388a13 (diff) | |
parent | b7007e1d615b8d4b71c28ebf790c5164fc4491d5 (diff) |
Merge remote-tracking branch 'gh-fslc/5.4-2.3.x-imx' into toradex_5.4-2.3.x-imx
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 6a5337c3c8f8..ce20150e7102 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); @@ -620,7 +618,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) { @@ -630,7 +628,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"); |