Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1354793

[PATCH v6 1/6] rockchip: power-domain: make idle handling optional

Show all headers | View raw

Not all new socs need to handle idle states on domain state changes,
so add the possibility to make them optional.

Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
---
 drivers/soc/rockchip/pm_domains.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/soc/rockchip/pm_domains.c b/drivers/soc/rockchip/pm_domains.c
index 18aee6b..c46312d 100644
--- a/drivers/soc/rockchip/pm_domains.c
+++ b/drivers/soc/rockchip/pm_domains.c
@@ -68,9 +68,9 @@ struct rockchip_pmu {
 {						\
 	.pwr_mask = BIT(pwr),			\
 	.status_mask = BIT(status),		\
-	.req_mask = BIT(req),			\
-	.idle_mask = BIT(idle),			\
-	.ack_mask = BIT(ack),			\
+	.req_mask = (req >= 0) ? BIT(req) : 0,		\
+	.idle_mask = (idle >= 0) ? BIT(idle) : 0,	\
+	.ack_mask = (ack >= 0) ? BIT(ack) : 0,		\
 }
 
 #define DOMAIN_RK3288(pwr, status, req)		\
@@ -96,6 +96,9 @@ static int rockchip_pmu_set_idle_request(struct rockchip_pm_domain *pd,
 	struct rockchip_pmu *pmu = pd->pmu;
 	unsigned int val;
 
+	if (pd_info->req_mask == 0)
+		return 0;
+
 	regmap_update_bits(pmu->regmap, pmu->info->req_offset,
 			   pd_info->req_mask, idle ? -1U : 0);
 
-- 
1.9.1

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[RESEND PATCH v6 0/6] rockchip: power-domain: fix pm domain for support RK3399 SoC Elaine Zhang <zhangqing@rock-chips.com> - 2016-03-10 03:50 +0100
  [PATCH v6 3/6] rockchip: power-domain: add support for sub-power domains Elaine Zhang <zhangqing@rock-chips.com> - 2016-03-10 03:50 +0100
  [PATCH v6 5/6] dt/bindings: rockchip: modify document of Rockchip power domains Elaine Zhang <zhangqing@rock-chips.com> - 2016-03-10 03:50 +0100
    Re: [PATCH v6 5/6] dt/bindings: rockchip: modify document of Rockchip power domains Heiko Stübner <heiko@sntech.de> - 2016-03-12 21:30 +0100
  [PATCH v6 6/6] rockchip: power-domain: Modify power domain driver for rk3399 Elaine Zhang <zhangqing@rock-chips.com> - 2016-03-10 03:50 +0100
  [PATCH v6 1/6] rockchip: power-domain: make idle handling optional Elaine Zhang <zhangqing@rock-chips.com> - 2016-03-10 03:50 +0100
  [PATCH v6 4/6] dt/bindings: power: add RK3399 SoCs header for power-domain Elaine Zhang <zhangqing@rock-chips.com> - 2016-03-10 03:50 +0100

csiph-web