From 106be32e3da9bd0b25e0622256024c2341cb8a76 Mon Sep 17 00:00:00 2001 From: Joakim Zhang Date: Thu, 18 Apr 2019 18:59:55 +0800 Subject: [PATCH] MLK-21495 can: flexcan: replace ARCH_MXC_ARM64 with HAVE_IMX_SC Upstream rejected ARCH_MXC_ARM64 in favor of defining ARCH_MXC for arm64. Update the CAN driver to check for CONFIG_HAVE_IMX_SC around SCFW-dependent code. Signed-off-by: Joakim Zhang --- drivers/net/can/flexcan.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c index fb5797fdecaf..e6cc0f7015c2 100644 --- a/drivers/net/can/flexcan.c +++ b/drivers/net/can/flexcan.c @@ -33,7 +33,7 @@ #include #include -#ifdef CONFIG_ARCH_MXC_ARM64 +#ifdef CONFIG_HAVE_IMX_SC #include #endif @@ -366,7 +366,7 @@ struct flexcan_priv { struct regmap *gpr; struct flexcan_stop_mode stm; -#ifdef CONFIG_ARCH_MXC_ARM64 +#ifdef CONFIG_HAVE_IMX_SC sc_ipc_t ipc_handle; #endif bool wakeup; @@ -588,7 +588,7 @@ static void flexcan_wake_mask_disable(struct flexcan_priv *priv) priv->write(reg_mcr, ®s->mcr); } -#ifdef CONFIG_ARCH_MXC_ARM64 +#ifdef CONFIG_HAVE_IMX_SC static void imx8_ipg_stop_enable(struct flexcan_priv *priv, bool enabled) { struct device_node *np = priv->dev->of_node; @@ -1681,7 +1681,7 @@ static void unregister_flexcandev(struct net_device *dev) unregister_candev(dev); } -#ifdef CONFIG_ARCH_MXC_ARM64 +#ifdef CONFIG_HAVE_IMX_SC static int imx8_sc_ipc_fetch(struct platform_device *pdev) { struct net_device *dev = platform_get_drvdata(pdev); @@ -1940,7 +1940,7 @@ static int flexcan_remove(struct platform_device *pdev) struct net_device *dev = platform_get_drvdata(pdev); struct flexcan_priv *priv = netdev_priv(dev); -#ifdef CONFIG_ARCH_MXC_ARM64 +#ifdef CONFIG_HAVE_IMX_SC sc_ipc_close(priv->ipc_handle); #endif unregister_flexcandev(dev); -- 2.17.1