summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Ian King <colin.king@canonical.com>2021-07-15 14:23:21 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-09-22 11:47:47 +0200
commit8ba71ffe2a3fb29a1f55f0cad7f2988318dc10f9 (patch)
treef3072b8866b3fff4eaabd8c30d6964aeaa412fc8
parent3ad9438f6d25d67668216174188a2683f17e19ae (diff)
downloadlinux-stable-8ba71ffe2a3fb29a1f55f0cad7f2988318dc10f9.tar.gz
linux-stable-8ba71ffe2a3fb29a1f55f0cad7f2988318dc10f9.tar.bz2
linux-stable-8ba71ffe2a3fb29a1f55f0cad7f2988318dc10f9.zip
ARM: imx: fix missing 3rd argument in macro imx_mmdc_perf_init
commit 20fb73911fec01f06592de1cdbca00b66602ebd7 upstream. The function imx_mmdc_perf_init recently had a 3rd argument added to it but the equivalent macro was not updated and is still the older 2 argument version. Fix this by adding in the missing 3rd argumement mmdc_ipg_clk. Fixes: f07ec8536580 ("ARM: imx: add missing clk_disable_unprepare()") Signed-off-by: Colin Ian King <colin.king@canonical.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org> Signed-off-by: Nobuhiro Iwamatsu (CIP) <nobuhiro1.iwamatsu@toshiba.co.jp> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/arm/mach-imx/mmdc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mmdc.c b/arch/arm/mach-imx/mmdc.c
index ba830be0b531..14be73ca107a 100644
--- a/arch/arm/mach-imx/mmdc.c
+++ b/arch/arm/mach-imx/mmdc.c
@@ -545,7 +545,7 @@ pmu_free:
#else
#define imx_mmdc_remove NULL
-#define imx_mmdc_perf_init(pdev, mmdc_base) 0
+#define imx_mmdc_perf_init(pdev, mmdc_base, mmdc_ipg_clk) 0
#endif
static int imx_mmdc_probe(struct platform_device *pdev)