From: Heiko Stuebner Date: Tue, 4 Aug 2015 22:14:55 +0000 (+0200) Subject: ARM: rockchip: rename osc_switch_to_32k variable X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=41fe6a01726b79b8531fed0a94b55d89a69ea5ee;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git ARM: rockchip: rename osc_switch_to_32k variable The variable name is misleading, as the deep suspend mode always switches the main supplying clock to the 32kHz source. Additionally the main oscillator remains running in some cases, which this var indicates. So rename it to osc_disable to clarity. Signed-off-by: Heiko Stuebner Reviewed-by: Chris Zhong Tested-by: Chris Zhong Reviewed-by: Douglas Anderson --- diff --git a/arch/arm/mach-rockchip/pm.c b/arch/arm/mach-rockchip/pm.c index 892bace139be..2ca1170da5d6 100644 --- a/arch/arm/mach-rockchip/pm.c +++ b/arch/arm/mach-rockchip/pm.c @@ -96,7 +96,7 @@ static bool rk3288_slp_disable_osc(void) static void rk3288_slp_mode_set(int level) { u32 mode_set, mode_set1; - bool osc_switch_to_32k = rk3288_slp_disable_osc(); + bool osc_disable = rk3288_slp_disable_osc(); regmap_read(sgrf_regmap, RK3288_SGRF_CPU_CON0, &rk3288_sgrf_cpu_con0); regmap_read(sgrf_regmap, RK3288_SGRF_SOC_CON0, &rk3288_sgrf_soc_con0); @@ -140,7 +140,7 @@ static void rk3288_slp_mode_set(int level) BIT(PMU_DDR1IO_RET_EN) | BIT(PMU_DDR0IO_RET_EN) | BIT(PMU_ALIVE_USE_LF) | BIT(PMU_PLL_PD_EN); - if (osc_switch_to_32k) + if (osc_disable) mode_set |= BIT(PMU_OSC_24M_DIS); mode_set1 |= BIT(PMU_CLR_ALIVE) | BIT(PMU_CLR_BUS) |