Commit fa6be65e authored by Fabio Estevam's avatar Fabio Estevam Committed by Shawn Guo

ARM: imx: Use INT_MEM_CLK_LPM as the bit name

Bit 17 of register CCM_CGPR is called INT_MEM_CLK_LPM as per the mx6
reference manual, so use this name instead.
Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
parent c0bea59c
...@@ -139,7 +139,7 @@ void imx_anatop_init(void); ...@@ -139,7 +139,7 @@ void imx_anatop_init(void);
void imx_anatop_pre_suspend(void); void imx_anatop_pre_suspend(void);
void imx_anatop_post_resume(void); void imx_anatop_post_resume(void);
int imx6q_set_lpm(enum mxc_cpu_pwr_mode mode); int imx6q_set_lpm(enum mxc_cpu_pwr_mode mode);
void imx6q_set_chicken_bit(void); void imx6q_set_int_mem_clk_lpm(void);
void imx_cpu_die(unsigned int cpu); void imx_cpu_die(unsigned int cpu);
int imx_cpu_kill(unsigned int cpu); int imx_cpu_kill(unsigned int cpu);
......
...@@ -68,8 +68,8 @@ int __init imx6q_cpuidle_init(void) ...@@ -68,8 +68,8 @@ int __init imx6q_cpuidle_init(void)
/* Need to enable SCU standby for entering WAIT modes */ /* Need to enable SCU standby for entering WAIT modes */
imx_scu_standby_enable(); imx_scu_standby_enable();
/* Set chicken bit to get a reliable WAIT mode support */ /* Set INT_MEM_CLK_LPM bit to get a reliable WAIT mode support */
imx6q_set_chicken_bit(); imx6q_set_int_mem_clk_lpm();
return cpuidle_register(&imx6q_cpuidle_driver, NULL); return cpuidle_register(&imx6q_cpuidle_driver, NULL);
} }
...@@ -56,15 +56,15 @@ ...@@ -56,15 +56,15 @@
#define BM_CLPCR_MASK_L2CC_IDLE (0x1 << 27) #define BM_CLPCR_MASK_L2CC_IDLE (0x1 << 27)
#define CGPR 0x64 #define CGPR 0x64
#define BM_CGPR_CHICKEN_BIT (0x1 << 17) #define BM_CGPR_INT_MEM_CLK_LPM (0x1 << 17)
static void __iomem *ccm_base; static void __iomem *ccm_base;
void imx6q_set_chicken_bit(void) void imx6q_set_int_mem_clk_lpm(void)
{ {
u32 val = readl_relaxed(ccm_base + CGPR); u32 val = readl_relaxed(ccm_base + CGPR);
val |= BM_CGPR_CHICKEN_BIT; val |= BM_CGPR_INT_MEM_CLK_LPM;
writel_relaxed(val, ccm_base + CGPR); writel_relaxed(val, ccm_base + CGPR);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment