From db8da3e7b05fac22e8f75214236d885d0d0d68d5 Mon Sep 17 00:00:00 2001 From: Finley Xiao Date: Fri, 11 Apr 2025 10:34:26 +0800 Subject: [PATCH] soc: rockchip: power-domain: Add protect for rv1126b pd npu and vdo Change-Id: I7d688a4eb0e2ec71245c5a635ee05e7c74adb645 Signed-off-by: Finley Xiao --- drivers/soc/rockchip/pm_domains.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/soc/rockchip/pm_domains.c b/drivers/soc/rockchip/pm_domains.c index 1b6c42528294..8f7e3455ba05 100644 --- a/drivers/soc/rockchip/pm_domains.c +++ b/drivers/soc/rockchip/pm_domains.c @@ -399,9 +399,6 @@ static void rockchip_pmu_unlock(struct rockchip_pm_domain *pd) DOMAIN_M_O(name, pwr, pwr, 0, req, idle, idle, r_offset, wakeup, false) #define DOMAIN_RV1126B(name, pwr, req, wakeup) \ - DOMAIN_M_G(name, pwr, pwr, req, req, req, req, wakeup, false) - -#define DOMAIN_RV1126B_P(name, pwr, req, wakeup) \ DOMAIN_M_G(name, pwr, pwr, req, req, req, req, wakeup, true) #define DOMAIN_RK3288(name, pwr, status, req, wakeup) \ @@ -1914,10 +1911,10 @@ static const struct rockchip_domain_info rv1126_pm_domains[] = { }; static const struct rockchip_domain_info rv1126b_pm_domains[] = { - /* name pwr req wakeup */ - [RV1126B_PD_NPU] = DOMAIN_RV1126B("npu", BIT(0), BIT(8), false), - [RV1126B_PD_VDO] = DOMAIN_RV1126B("vdo", BIT(1), BIT(9), false), - [RV1126B_PD_AISP] = DOMAIN_RV1126B_P("aisp", BIT(2), BIT(10), false), + /* name pwr req wakeup */ + [RV1126B_PD_NPU] = DOMAIN_RV1126B("npu", BIT(0), BIT(8), false), + [RV1126B_PD_VDO] = DOMAIN_RV1126B("vdo", BIT(1), BIT(9), false), + [RV1126B_PD_AISP] = DOMAIN_RV1126B("aisp", BIT(2), BIT(10), false), }; static const struct rockchip_domain_info rk1808_pm_domains[] = {