MLK-21500 rpmsg: imx: CONFIG_ARCH_MXC_ARM64 should be replaced
authorRichard Zhu <hongxing.zhu@nxp.com>
Fri, 19 Apr 2019 06:12:55 +0000 (14:12 +0800)
committerRichard Zhu <hongxing.zhu@nxp.com>
Fri, 19 Apr 2019 06:12:55 +0000 (14:12 +0800)
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 <hongxing.zhu@nxp.com>
drivers/rpmsg/imx_rpmsg.c

index 9dfb498..498a16d 100644 (file)
@@ -33,7 +33,7 @@
 #include <linux/virtio_ring.h>
 #include <linux/imx_rpmsg.h>
 #include <linux/mx8_mu.h>
-#ifdef CONFIG_ARCH_MXC_ARM64
+#ifdef CONFIG_HAVE_IMX_SC
 #include <soc/imx8/sc/sci.h>
 #include <soc/imx8/sc/svc/irq/api.h>
 #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;