summaryrefslogtreecommitdiff
path: root/arch/arm/mach-imx/clk-imx6sx.c
diff options
context:
space:
mode:
authorRichard Zhu <Richard.Zhu@freescale.com>2015-06-02 15:23:59 +0800
committerRichard Zhu <Richard.Zhu@freescale.com>2015-06-03 09:43:26 +0800
commitb1490ecdbd270f2551da9c7a80e3231d55e82cb7 (patch)
treeaff93b7e38d98ed5dc9296d08077bb3a35bc72e1 /arch/arm/mach-imx/clk-imx6sx.c
parent4d26ef3c73b5c32828da7de78832d54ce5106357 (diff)
MLK-11016 arm: clk: enable m4 root clk when m4 core is running
M4 root clk shouldn't be turn off when M4 core is running Signed-off-by: Richard Zhu <Richard.Zhu@freescale.com>
Diffstat (limited to 'arch/arm/mach-imx/clk-imx6sx.c')
-rw-r--r--arch/arm/mach-imx/clk-imx6sx.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/clk-imx6sx.c b/arch/arm/mach-imx/clk-imx6sx.c
index 185034f90c9c..8431576ec75d 100644
--- a/arch/arm/mach-imx/clk-imx6sx.c
+++ b/arch/arm/mach-imx/clk-imx6sx.c
@@ -23,6 +23,7 @@
#include "clk.h"
#include "common.h"
+#include "hardware.h"
#define CCM_CCGR_OFFSET(index) (index * 2)
#define CCDR 0x4
@@ -698,7 +699,7 @@ static int __init imx_amp_power_init(void)
int i;
void __iomem *shared_mem_base;
- if (!imx_src_is_m4_enabled())
+ if (!(imx_src_is_m4_enabled() && cpu_is_imx6sx()))
return 0;
amp_power_mutex = imx_sema4_mutex_create(0, MCC_POWER_SHMEM_NUMBER);