diff options
| author | Robin Gong <yibin.gong@nxp.com> | 2019-01-10 19:10:03 +0800 |
|---|---|---|
| committer | Jason Liu <jason.hui.liu@nxp.com> | 2019-02-12 10:35:53 +0800 |
| commit | 160ae9fe1afb674397348148f9bad411d6f02386 (patch) | |
| tree | 85f95e77ae8e87879af2fa5f7a5ed380422b21a3 /drivers/rpmsg | |
| parent | 9fdffcbfe993e26c7b51b05b4f66cd0ce6cbcb32 (diff) | |
MLK-20706 rpmsg: imx_rpmsg: fix building error on i.mx6/7 legancy chip
Fix building error caused by commit c6cd4096c224f("MLK-20691-1:
rpmsg: imx_rpmsg: add new partition reset interrupt") because
of no scu functions on i.mx6sx/7d legancy chip.
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Acked-by: Richard Zhu <hongxing.zhu@nxp.com>
Diffstat (limited to 'drivers/rpmsg')
| -rw-r--r-- | drivers/rpmsg/imx_rpmsg.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/rpmsg/imx_rpmsg.c b/drivers/rpmsg/imx_rpmsg.c index ced9c664af9d..a526f00ca3e1 100644 --- a/drivers/rpmsg/imx_rpmsg.c +++ b/drivers/rpmsg/imx_rpmsg.c @@ -33,8 +33,10 @@ #include <linux/virtio_ring.h> #include <linux/imx_rpmsg.h> #include <linux/mx8_mu.h> +#ifdef CONFIG_ARCH_MXC_ARM64 #include <soc/imx8/sc/sci.h> #include <soc/imx8/sc/svc/irq/api.h> +#endif #include "rpmsg_internal.h" enum imx_rpmsg_variants { @@ -533,6 +535,7 @@ void imx_rpmsg_restore(struct imx_rpmsg_vproc *rpdev) static int imx_rpmsg_partion_notify0(struct notifier_block *nb, unsigned long event, void *group) { +#ifdef CONFIG_ARCH_MXC_ARM64 struct imx_rpmsg_vproc *rpdev = &imx_rpmsg_vprocs[0]; /* Ignore other irqs */ @@ -542,13 +545,14 @@ static int imx_rpmsg_partion_notify0(struct notifier_block *nb, imx_rpmsg_restore(rpdev); pr_info("Patition%d reset!\n", rpdev->mub_partition); - +#endif return 0; } static int imx_rpmsg_partion_notify1(struct notifier_block *nb, unsigned long event, void *group) { +#ifdef CONFIG_ARCH_MXC_ARM64 struct imx_rpmsg_vproc *rpdev = &imx_rpmsg_vprocs[1]; /* Ignore other irqs */ @@ -558,7 +562,7 @@ static int imx_rpmsg_partion_notify1(struct notifier_block *nb, imx_rpmsg_restore(rpdev); pr_info("Patition%d reset!\n", rpdev->mub_partition); - +#endif return 0; } @@ -686,6 +690,7 @@ static int imx_rpmsg_probe(struct platform_device *pdev) platform_set_drvdata(pdev, rpdev); +#ifdef CONFIG_ARCH_MXC_ARM64 if (rpdev->variant == IMX8QXP || rpdev->variant == IMX8QM) { uint32_t mu_id; sc_err_t sciErr; @@ -718,6 +723,7 @@ static int imx_rpmsg_probe(struct platform_device *pdev) return register_scu_notifier(rpdev->pnotifier); } +#endif return ret; |