aboutsummaryrefslogtreecommitdiffstats
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-08-12 13:22:02 +0200
commitee6f7084324d6735756385b9c7ece158afcde700 (patch)
tree7e2d1354da61b8e43c8e279d9b0ca06c82e2c4d3
parente1011b9c597df889b82b390b53680d1210cde19b (diff)
downloadkernel_replicant_linux-ee6f7084324d6735756385b9c7ece158afcde700.tar.gz
kernel_replicant_linux-ee6f7084324d6735756385b9c7ece158afcde700.tar.bz2
kernel_replicant_linux-ee6f7084324d6735756385b9c7ece158afcde700.zip
ARM: imx: fix missing 3rd argument in macro imx_mmdc_perf_init
[ Upstream commit 20fb73911fec01f06592de1cdbca00b66602ebd7 ] 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: Sasha Levin <sashal@kernel.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 4a6f1359e1e9..af12668d0bf5 100644
--- a/arch/arm/mach-imx/mmdc.c
+++ b/arch/arm/mach-imx/mmdc.c
@@ -534,7 +534,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)