LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Elaine Zhang <zhangqing@rock-chips.com>
To: heiko@sntech.de, robh+dt@kernel.org, mark.rutland@arm.com
Cc: devicetree@vger.kernel.org, rjw@rjwysocki.net,
khilman@kernel.org, ulf.hansson@linaro.org,
linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org,
wxt@rock-chips.com, xxx@rock-chips.com, xf@rock-chips.com,
huangtao@rock-chips.com, Finley Xiao <finley.xiao@rock-chips.com>,
Elaine Zhang <zhangqing@rock-chips.com>
Subject: [PATCH v3 04/13] soc: rockchip: power-domain: Fix wrong value when power up pd
Date: Wed, 23 May 2018 14:48:40 +0800 [thread overview]
Message-ID: <1527058129-10260-5-git-send-email-zhangqing@rock-chips.com> (raw)
In-Reply-To: <1527058129-10260-1-git-send-email-zhangqing@rock-chips.com>
From: Finley Xiao <finley.xiao@rock-chips.com>
Solve the pd could only ever turn off but never turn them on again,
If the pd registers have the writemask bits.
Fix up the code error for commit:
commit 79bb17ce8edb3141339b5882e372d0ec7346217c
Author: Elaine Zhang <zhangqing@rock-chips.com>
Date: Fri Dec 23 11:47:52 2016 +0800
soc: rockchip: power-domain: Support domain control in hiword-registers
New Rockchips SoCs may have their power-domain control in registers
using a writemask-based access scheme (upper 16bit being the write
mask). So add a DOMAIN_M type and handle this case accordingly.
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
---
drivers/soc/rockchip/pm_domains.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/soc/rockchip/pm_domains.c b/drivers/soc/rockchip/pm_domains.c
index ebd7c41898c0..01d4ba26a054 100644
--- a/drivers/soc/rockchip/pm_domains.c
+++ b/drivers/soc/rockchip/pm_domains.c
@@ -264,7 +264,7 @@ static void rockchip_do_pmu_set_power_domain(struct rockchip_pm_domain *pd,
return;
else if (pd->info->pwr_w_mask)
regmap_write(pmu->regmap, pmu->info->pwr_offset,
- on ? pd->info->pwr_mask :
+ on ? pd->info->pwr_w_mask :
(pd->info->pwr_mask | pd->info->pwr_w_mask));
else
regmap_update_bits(pmu->regmap, pmu->info->pwr_offset,
--
1.9.1
next prev parent reply other threads:[~2018-05-23 6:43 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-23 6:48 [PATCH v3 00/13] add power domain support for Rockchip Socs Elaine Zhang
2018-05-23 6:48 ` [PATCH v3 01/13] dt-bindings: power: add RK3036 SoCs header for power-domain Elaine Zhang
2018-05-23 10:55 ` Heiko Stübner
2018-05-23 6:48 ` [PATCH v3 02/13] dt-bindings: add binding for rk3036 power domains Elaine Zhang
2018-05-23 10:56 ` Heiko Stübner
2018-05-23 6:48 ` [PATCH v3 03/13] Soc: rockchip: power-domain: add power domain support for rk3036 Elaine Zhang
2018-05-23 10:57 ` Heiko Stübner
2018-05-23 6:48 ` Elaine Zhang [this message]
2018-05-23 10:57 ` [PATCH v3 04/13] soc: rockchip: power-domain: Fix wrong value when power up pd Heiko Stübner
2018-05-23 6:50 ` [PATCH v3 05/13] dt-bindings: power: add RK3128 SoCs header for power-domain Elaine Zhang
2018-05-23 11:16 ` Heiko Stübner
2018-05-23 6:50 ` [PATCH v3 06/13] dt-bindings: add binding for rk3128 power domains Elaine Zhang
2018-05-23 11:17 ` Heiko Stübner
2018-05-23 6:51 ` [PATCH v3 07/13] soc: rockchip: power-domain: add power domain support for rk3128 Elaine Zhang
2018-05-23 11:18 ` Heiko Stübner
2018-05-23 6:51 ` [PATCH v3 08/13] dt-bindings: power: add RK3228 SoCs header for power-domain Elaine Zhang
2018-05-23 16:23 ` Rob Herring
2018-05-23 20:09 ` Heiko Stübner
2018-05-23 6:51 ` [PATCH v3 09/13] dt-bindings: add binding for rk3228 power domains Elaine Zhang
2018-05-23 20:09 ` Heiko Stübner
2018-05-23 6:52 ` [PATCH v3 10/13] soc: rockchip: power-domain: add power domain support for rk3228 Elaine Zhang
2018-05-23 20:09 ` Heiko Stübner
2018-05-23 6:52 ` [PATCH v3 11/13] dt-bindings: power: add PX30 SoCs header for power-domain Elaine Zhang
2018-05-23 16:23 ` Rob Herring
2018-05-23 20:10 ` Heiko Stübner
2018-05-23 6:52 ` [PATCH v3 12/13] dt-bindings: add binding for px30 power domains Elaine Zhang
2018-05-23 16:24 ` Rob Herring
2018-05-23 20:10 ` Heiko Stübner
2018-05-23 6:53 ` [PATCH v3 13/13] soc: rockchip: power-domain: add power domain support for px30 Elaine Zhang
2018-05-23 20:10 ` Heiko Stübner
2018-05-23 10:02 ` [PATCH v3 00/13] add power domain support for Rockchip Socs Ulf Hansson
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=1527058129-10260-5-git-send-email-zhangqing@rock-chips.com \
--to=zhangqing@rock-chips.com \
--cc=devicetree@vger.kernel.org \
--cc=finley.xiao@rock-chips.com \
--cc=heiko@sntech.de \
--cc=huangtao@rock-chips.com \
--cc=khilman@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=mark.rutland@arm.com \
--cc=rjw@rjwysocki.net \
--cc=robh+dt@kernel.org \
--cc=ulf.hansson@linaro.org \
--cc=wxt@rock-chips.com \
--cc=xf@rock-chips.com \
--cc=xxx@rock-chips.com \
--subject='Re: [PATCH v3 04/13] soc: rockchip: power-domain: Fix wrong value when power up pd' \
/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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).