Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41fe6a01 authored by Heiko Stuebner's avatar Heiko Stuebner
Browse files

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: default avatarHeiko Stuebner <heiko@sntech.de>
Reviewed-by: default avatarChris Zhong <zyw@rock-chips.com>
Tested-by: default avatarChris Zhong <zyw@rock-chips.com>
Reviewed-by: default avatarDouglas Anderson <dianders@chromium.org>
parent cb8cc37f

arch/arm/mach-rockchip/pm.c

+2 −2
Original line number Diff line number Diff line
@@ -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) |