Skip to content

Commit 47c7b3c

Browse files
finley1226Ulf Hansson
authored andcommitted
pmdomain: rockchip: Add support for RV1126B
Add configuration and power domains for RV1126 SoC. Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com> Reviewed-by: Heiko Stuebner <heiko@sntech.de> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
1 parent 56b0d23 commit 47c7b3c

1 file changed

Lines changed: 41 additions & 0 deletions

File tree

drivers/pmdomain/rockchip/pm-domains.c

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include <soc/rockchip/rockchip_sip.h>
2626
#include <dt-bindings/power/px30-power.h>
2727
#include <dt-bindings/power/rockchip,rv1126-power.h>
28+
#include <dt-bindings/power/rockchip,rv1126b-power-controller.h>
2829
#include <dt-bindings/power/rk3036-power.h>
2930
#include <dt-bindings/power/rk3066-power.h>
3031
#include <dt-bindings/power/rk3128-power.h>
@@ -137,6 +138,20 @@ struct rockchip_pmu {
137138
.active_wakeup = wakeup, \
138139
}
139140

141+
#define DOMAIN_M_G(_name, pwr, status, req, idle, ack, g_mask, wakeup, keepon) \
142+
{ \
143+
.name = _name, \
144+
.pwr_w_mask = (pwr) << 16, \
145+
.pwr_mask = (pwr), \
146+
.status_mask = (status), \
147+
.req_w_mask = (req) << 16, \
148+
.req_mask = (req), \
149+
.idle_mask = (idle), \
150+
.ack_mask = (ack), \
151+
.clk_ungate_mask = (g_mask), \
152+
.active_wakeup = wakeup, \
153+
}
154+
140155
#define DOMAIN_M_G_SD(_name, pwr, status, req, idle, ack, g_mask, mem, wakeup, keepon) \
141156
{ \
142157
.name = _name, \
@@ -205,6 +220,9 @@ struct rockchip_pmu {
205220
#define DOMAIN_RV1126(name, pwr, req, idle, wakeup) \
206221
DOMAIN_M(name, pwr, pwr, req, idle, idle, wakeup)
207222

223+
#define DOMAIN_RV1126B(name, pwr, req, wakeup) \
224+
DOMAIN_M_G(name, pwr, pwr, req, req, req, req, wakeup, true)
225+
208226
#define DOMAIN_RK3288(name, pwr, status, req, wakeup) \
209227
DOMAIN(name, pwr, status, req, req, (req) << 16, wakeup)
210228

@@ -1104,6 +1122,13 @@ static const struct rockchip_domain_info rv1126_pm_domains[] = {
11041122
[RV1126_PD_USB] = DOMAIN_RV1126("usb", BIT(9), BIT(15), BIT(15), false),
11051123
};
11061124

1125+
static const struct rockchip_domain_info rv1126b_pm_domains[] = {
1126+
/* name pwr req wakeup */
1127+
[RV1126B_PD_NPU] = DOMAIN_RV1126B("npu", BIT(0), BIT(8), false),
1128+
[RV1126B_PD_VDO] = DOMAIN_RV1126B("vdo", BIT(1), BIT(9), false),
1129+
[RV1126B_PD_AIISP] = DOMAIN_RV1126B("aiisp", BIT(2), BIT(10), false),
1130+
};
1131+
11071132
static const struct rockchip_domain_info rk3036_pm_domains[] = {
11081133
[RK3036_PD_MSCH] = DOMAIN_RK3036("msch", BIT(14), BIT(23), BIT(30), true),
11091134
[RK3036_PD_CORE] = DOMAIN_RK3036("core", BIT(13), BIT(17), BIT(24), false),
@@ -1516,6 +1541,18 @@ static const struct rockchip_pmu_info rv1126_pmu = {
15161541
.domain_info = rv1126_pm_domains,
15171542
};
15181543

1544+
static const struct rockchip_pmu_info rv1126b_pmu = {
1545+
.pwr_offset = 0x210,
1546+
.status_offset = 0x230,
1547+
.req_offset = 0x110,
1548+
.idle_offset = 0x128,
1549+
.ack_offset = 0x120,
1550+
.clk_ungate_offset = 0x140,
1551+
1552+
.num_domains = ARRAY_SIZE(rv1126b_pm_domains),
1553+
.domain_info = rv1126b_pm_domains,
1554+
};
1555+
15191556
static const struct of_device_id rockchip_pm_domain_dt_match[] = {
15201557
{
15211558
.compatible = "rockchip,px30-power-controller",
@@ -1585,6 +1622,10 @@ static const struct of_device_id rockchip_pm_domain_dt_match[] = {
15851622
.compatible = "rockchip,rv1126-power-controller",
15861623
.data = (void *)&rv1126_pmu,
15871624
},
1625+
{
1626+
.compatible = "rockchip,rv1126b-power-controller",
1627+
.data = (void *)&rv1126b_pmu,
1628+
},
15881629
{ /* sentinel */ },
15891630
};
15901631

0 commit comments

Comments
 (0)