From 98a9c6698d638f4b10e84d3185d767e27fd60fe3 Mon Sep 17 00:00:00 2001 From: Richard Zhu Date: Fri, 19 Apr 2019 14:12:55 +0800 Subject: [PATCH] MLK-21500 rpmsg: imx: CONFIG_ARCH_MXC_ARM64 should be replaced Since CONFIG_ARCH_MXC_ARM64 does not exist on imx_4.19.y, this should be replaced by CONFIG_HAVE_IMX_SC. Signed-off-by: Richard Zhu --- drivers/rpmsg/imx_rpmsg.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/rpmsg/imx_rpmsg.c b/drivers/rpmsg/imx_rpmsg.c index 9dfb49881a31..498a16de6810 100644 --- a/drivers/rpmsg/imx_rpmsg.c +++ b/drivers/rpmsg/imx_rpmsg.c @@ -33,7 +33,7 @@ #include #include #include -#ifdef CONFIG_ARCH_MXC_ARM64 +#ifdef CONFIG_HAVE_IMX_SC #include #include #endif @@ -558,7 +558,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 +#ifdef CONFIG_HAVE_IMX_SC struct imx_rpmsg_vproc *rpdev = &imx_rpmsg_vprocs[0]; /* Ignore other irqs */ @@ -575,7 +575,7 @@ static int imx_rpmsg_partion_notify0(struct notifier_block *nb, static int imx_rpmsg_partion_notify1(struct notifier_block *nb, unsigned long event, void *group) { -#ifdef CONFIG_ARCH_MXC_ARM64 +#ifdef CONFIG_HAVE_IMX_SC struct imx_rpmsg_vproc *rpdev = &imx_rpmsg_vprocs[1]; /* Ignore other irqs */ @@ -714,7 +714,7 @@ static int imx_rpmsg_probe(struct platform_device *pdev) platform_set_drvdata(pdev, rpdev); -#ifdef CONFIG_ARCH_MXC_ARM64 +#ifdef CONFIG_HAVE_IMX_SC if (rpdev->variant == IMX8QXP || rpdev->variant == IMX8QM) { uint32_t mu_id; sc_err_t sciErr; -- 2.17.1