summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-imx/cpuidle-imx6ul.c3
-rw-r--r--arch/arm/mach-imx/pm-imx6.c3
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/cpuidle-imx6ul.c b/arch/arm/mach-imx/cpuidle-imx6ul.c
index d07375fed12d..d9d445c4222d 100644
--- a/arch/arm/mach-imx/cpuidle-imx6ul.c
+++ b/arch/arm/mach-imx/cpuidle-imx6ul.c
@@ -180,5 +180,8 @@ int __init imx6ul_cpuidle_init(void)
imx6ul_wfi_in_iram_fn = (void *)fncpy(wfi_iram_base + sizeof(*cpuidle_pm_info),
&imx6ul_low_power_idle, wfi_code_size);
#endif
+
+ imx6q_set_int_mem_clk_lpm(true);
+
return cpuidle_register(&imx6ul_cpuidle_driver, NULL);
}
diff --git a/arch/arm/mach-imx/pm-imx6.c b/arch/arm/mach-imx/pm-imx6.c
index aa186522d473..e1a45e2cb974 100644
--- a/arch/arm/mach-imx/pm-imx6.c
+++ b/arch/arm/mach-imx/pm-imx6.c
@@ -479,7 +479,8 @@ void imx6q_set_int_mem_clk_lpm(bool enable)
if ((cpu_is_imx6q() && imx_get_soc_revision() >
IMX_CHIP_REVISION_1_1) ||
(cpu_is_imx6dl() && imx_get_soc_revision() >
- IMX_CHIP_REVISION_1_0) || cpu_is_imx6sx()) {
+ IMX_CHIP_REVISION_1_0) || cpu_is_imx6sx() ||
+ cpu_is_imx6ul()) {
u32 val;
val = readl_relaxed(ccm_base + CGPR);