leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc: rockchip: power-domain: Support domain control in hiword-registers

Browse Source 
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>
This commit is contained in:
Elaine Zhang 2016-12-23 11:47:52 +08:00 committed by Heiko Stuebner
parent 0c744ea4f7
commit 79bb17ce8e
1 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/soc/rockchip/pm_domains.c
View File

@ -29,6 +29,8 @@ struct rockchip_domain_info {
int idle_mask; int idle_mask;
int ack_mask; int ack_mask;
bool active_wakeup; bool active_wakeup;
int pwr_w_mask;
int req_w_mask;
}; };
struct rockchip_pmu_info { struct rockchip_pmu_info {
@ -87,6 +89,18 @@ struct rockchip_pmu {
.active_wakeup = wakeup, \ .active_wakeup = wakeup, \
} }
#define DOMAIN_M(pwr, status, req, idle, ack, wakeup) \
{ \
.pwr_w_mask = (pwr >= 0) ? BIT(pwr + 16) : 0, \
.pwr_mask = (pwr >= 0) ? BIT(pwr) : 0, \
.status_mask = (status >= 0) ? BIT(status) : 0, \
.req_w_mask = (req >= 0) ? BIT(req + 16) : 0, \
.req_mask = (req >= 0) ? BIT(req) : 0, \
.idle_mask = (idle >= 0) ? BIT(idle) : 0, \
.ack_mask = (ack >= 0) ? BIT(ack) : 0, \
.active_wakeup = wakeup, \
}
#define DOMAIN_RK3288(pwr, status, req, wakeup) \ #define DOMAIN_RK3288(pwr, status, req, wakeup) \
DOMAIN(pwr, status, req, req, (req) + 16, wakeup) DOMAIN(pwr, status, req, req, (req) + 16, wakeup)
@ -127,9 +141,13 @@ static int rockchip_pmu_set_idle_request(struct rockchip_pm_domain *pd,
if (pd_info->req_mask == 0) if (pd_info->req_mask == 0)
return 0; return 0;
else if (pd_info->req_w_mask)
regmap_update_bits(pmu->regmap, pmu->info->req_offset, regmap_write(pmu->regmap, pmu->info->req_offset,
pd_info->req_mask, idle ? -1U : 0); idle ? (pd_info->req_mask | pd_info->req_w_mask) :
pd_info->req_w_mask);
else
regmap_update_bits(pmu->regmap, pmu->info->req_offset,
pd_info->req_mask, idle ? -1U : 0);
dsb(sy); dsb(sy);
@ -230,9 +248,13 @@ static void rockchip_do_pmu_set_power_domain(struct rockchip_pm_domain *pd,
if (pd->info->pwr_mask == 0) if (pd->info->pwr_mask == 0)
return; return;
else if (pd->info->pwr_w_mask)
regmap_update_bits(pmu->regmap, pmu->info->pwr_offset, regmap_write(pmu->regmap, pmu->info->pwr_offset,
pd->info->pwr_mask, on ? 0 : -1U); on ? pd->info->pwr_mask :
(pd->info->pwr_mask | pd->info->pwr_w_mask));
else
regmap_update_bits(pmu->regmap, pmu->info->pwr_offset,
pd->info->pwr_mask, on ? 0 : -1U);
dsb(sy); dsb(sy);