From: heiko@sntech.de (Heiko Stübner)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 1/3] ARM: rockchip: rename osc_switch_to_32k variable
Date: Wed, 05 Aug 2015 00:50:39 +0200 [thread overview]
Message-ID: <2128609.Kb18M8K28F@diego> (raw)
The variable name is misleading, as the deep suspend mode always switches
the main supplying clock to the 32kHz source. Additionally the main
oscillator remain running in some cases, which this var indicates.
So rename it to osc_disable to clarity.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
arch/arm/mach-rockchip/pm.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-rockchip/pm.c b/arch/arm/mach-rockchip/pm.c
index 892bace..2ca1170 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) |
--
2.1.4
next reply other threads:[~2015-08-04 22:50 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-04 22:50 Heiko Stübner [this message]
2015-08-04 22:51 ` [PATCH v3 2/3] ARM: rockchip: set correct stabilization thresholds in suspend Heiko Stübner
2015-08-05 10:41 ` Chris Zhong
2015-08-06 1:54 ` Doug Anderson
2015-08-04 22:51 ` [PATCH v3 3/3] ARM: rockchip: enable PMU_GPIOINT_WAKEUP_EN when entering shallow suspend Heiko Stübner
2015-08-05 10:51 ` Chris Zhong
2015-08-06 1:55 ` Doug Anderson
2015-08-06 11:10 ` Heiko Stübner
2015-08-05 10:36 ` [PATCH v3 1/3] ARM: rockchip: rename osc_switch_to_32k variable Chris Zhong
2015-08-05 23:45 ` Doug Anderson
2015-08-06 11:11 ` Heiko Stübner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2128609.Kb18M8K28F@diego \
--to=heiko@sntech.de \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox