From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1425519AbcBRImy (ORCPT ); Thu, 18 Feb 2016 03:42:54 -0500 Received: from regular1.263xmail.com ([211.150.99.131]:46077 "EHLO regular1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965431AbcBRImw (ORCPT ); Thu, 18 Feb 2016 03:42:52 -0500 X-263anti-spam: KSV:0; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-KSVirus-check: 0 X-ABS-CHECKED: 4 X-ADDR-CHECKED: 0 X-RL-SENDER: zhangqing@rock-chips.com X-SENDER-IP: 58.22.7.114 X-LOGIN-NAME: zhangqing@rock-chips.com X-UNIQUE-TAG: <15cae017de287eb4e998c00decff93eb> X-ATTACHMENT-NUM: 0 X-DNS-TYPE: 0 From: Elaine Zhang To: heiko@sntech.de, wxt@rock-chips.com Cc: linux-arm-kernel@lists.infradead.org, huangtao@rock-chips.com, zyw@rock-chips.com, xxx@rock-chips.com, jay.xu@rock-chips.com, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Elaine Zhang Subject: [PATCH v2 1/6] rockchip: power-domain: make idle handling optional Date: Thu, 18 Feb 2016 11:07:13 +0800 Message-Id: <1455764838-12928-2-git-send-email-zhangqing@rock-chips.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1455764838-12928-1-git-send-email-zhangqing@rock-chips.com> References: <1455764838-12928-1-git-send-email-zhangqing@rock-chips.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Signed-off-by: Heiko Stuebner --- drivers/soc/rockchip/pm_domains.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/soc/rockchip/pm_domains.c b/drivers/soc/rockchip/pm_domains.c index 6cdffb1..3dcc611 100644 --- a/drivers/soc/rockchip/pm_domains.c +++ b/drivers/soc/rockchip/pm_domains.c @@ -63,14 +63,16 @@ struct rockchip_pmu { }; #define to_rockchip_pd(gpd) container_of(gpd, struct rockchip_pm_domain, genpd) +#define NULL_BIT -32 +#define OVERFLOW_MASK 32 #define DOMAIN(pwr, status, req, idle, ack) \ { \ .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) : OVERFLOW_MASK, \ + .idle_mask = (idle >= 0) ? BIT(idle) : OVERFLOW_MASK, \ + .ack_mask = (ack >= 0) ? BIT(ack) : OVERFLOW_MASK, \ } #define DOMAIN_RK3288(pwr, status, req) \ @@ -96,6 +98,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 >= OVERFLOW_MASK) + return 0; + regmap_update_bits(pmu->regmap, pmu->info->req_offset, pd_info->req_mask, idle ? -1U : 0); -- 1.9.1