[PATCH 09/12] power: domain: mediatek: rename struct mtk_scp_domain to mtk_scpsys
Julien Stephan
jstephan at baylibre.com
Wed Jul 8 15:07:15 CEST 2026
Prepare for support of future MediaTek SoCs by renaming struct
mtk_scp_domain to struct mtk_scpsys.
Upcoming SoCs require additional per-domain runtime data obtained from
Device Tree. To keep the domain_data description in soc_data static
const, a new wrapper structure will be introduced to combine the
immutable domain_data description with the runtime data. The natural
name for that wrapper is struct mtk_scp_domain, so free that name by
renaming the existing runtime state structure to struct mtk_scpsys.
Update the MT7623 and MT7629 drivers accordingly.
No functional change intended.
Signed-off-by: Julien Stephan <jstephan at baylibre.com>
---
drivers/power/domain/mt7623-power-domain.c | 2 +-
drivers/power/domain/mt7629-power-domain.c | 2 +-
drivers/power/domain/mtk-power-domain.c | 44 +++++++++++++++---------------
drivers/power/domain/mtk-power-domain.h | 2 +-
4 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/drivers/power/domain/mt7623-power-domain.c b/drivers/power/domain/mt7623-power-domain.c
index 318f0fc8e76..b47ad4cde47 100644
--- a/drivers/power/domain/mt7623-power-domain.c
+++ b/drivers/power/domain/mt7623-power-domain.c
@@ -81,5 +81,5 @@ U_BOOT_DRIVER(mt7623_power_domain) = {
.ops = &mtk_power_domain_ops,
.probe = mtk_scpsys_probe,
.of_match = mt7623_power_domain_ids,
- .priv_auto = sizeof(struct mtk_scp_domain),
+ .priv_auto = sizeof(struct mtk_scpsys),
};
diff --git a/drivers/power/domain/mt7629-power-domain.c b/drivers/power/domain/mt7629-power-domain.c
index 6cc413b7a89..2f7f462579a 100644
--- a/drivers/power/domain/mt7629-power-domain.c
+++ b/drivers/power/domain/mt7629-power-domain.c
@@ -56,5 +56,5 @@ U_BOOT_DRIVER(mt7629_power_domain) = {
.ops = &mtk_power_domain_ops,
.probe = mtk_scpsys_probe,
.of_match = mt7629_power_domain_ids,
- .priv_auto = sizeof(struct mtk_scp_domain),
+ .priv_auto = sizeof(struct mtk_scpsys),
};
diff --git a/drivers/power/domain/mtk-power-domain.c b/drivers/power/domain/mtk-power-domain.c
index e0293aadfd8..3b0a90d3f94 100644
--- a/drivers/power/domain/mtk-power-domain.c
+++ b/drivers/power/domain/mtk-power-domain.c
@@ -43,12 +43,12 @@ static int mtk_infracfg_clear_bus_protection(void __iomem *infracfg,
static int mtk_scpsys_domain_is_on(struct power_domain *power_domain)
{
- struct mtk_scp_domain *scpd = dev_get_priv(power_domain->dev);
- const struct mtk_scp_domain_data *data = &scpd->soc_data->data[power_domain->id];
- u32 sta = readl(scpd->base + SPM_PWR_STATUS) &
- data->sta_mask;
- u32 sta2 = readl(scpd->base + SPM_PWR_STATUS_2ND) &
- data->sta_mask;
+ struct mtk_scpsys *scpsys = dev_get_priv(power_domain->dev);
+ const struct mtk_scp_domain_data *data = &scpsys->soc_data->data[power_domain->id];
+ u32 sta = readl(scpsys->base + SPM_PWR_STATUS) &
+ data->sta_mask;
+ u32 sta2 = readl(scpsys->base + SPM_PWR_STATUS_2ND) &
+ data->sta_mask;
/*
* A domain is on when both status bits are set. If only one is set
@@ -64,14 +64,14 @@ static int mtk_scpsys_domain_is_on(struct power_domain *power_domain)
static int mtk_scpsys_power_on(struct power_domain *power_domain)
{
- struct mtk_scp_domain *scpd = dev_get_priv(power_domain->dev);
- const struct mtk_scp_domain_data *data = &scpd->soc_data->data[power_domain->id];
- void __iomem *ctl_addr = scpd->base + data->ctl_offs;
+ struct mtk_scpsys *scpsys = dev_get_priv(power_domain->dev);
+ const struct mtk_scp_domain_data *data = &scpsys->soc_data->data[power_domain->id];
+ void __iomem *ctl_addr = scpsys->base + data->ctl_offs;
u32 pdn_ack = data->sram_pdn_ack_bits;
u32 val;
int ret, tmp;
- writel(SPM_EN, scpd->base);
+ writel(SPM_EN, scpsys->base);
val = readl(ctl_addr);
val |= PWR_ON_BIT;
@@ -102,7 +102,7 @@ static int mtk_scpsys_power_on(struct power_domain *power_domain)
return ret;
if (data->bus_prot_mask) {
- ret = mtk_infracfg_clear_bus_protection(scpd->infracfg,
+ ret = mtk_infracfg_clear_bus_protection(scpsys->infracfg,
data->bus_prot_mask);
if (ret)
return ret;
@@ -113,15 +113,15 @@ static int mtk_scpsys_power_on(struct power_domain *power_domain)
static int mtk_scpsys_power_off(struct power_domain *power_domain)
{
- struct mtk_scp_domain *scpd = dev_get_priv(power_domain->dev);
- const struct mtk_scp_domain_data *data = &scpd->soc_data->data[power_domain->id];
- void __iomem *ctl_addr = scpd->base + data->ctl_offs;
+ struct mtk_scpsys *scpsys = dev_get_priv(power_domain->dev);
+ const struct mtk_scp_domain_data *data = &scpsys->soc_data->data[power_domain->id];
+ void __iomem *ctl_addr = scpsys->base + data->ctl_offs;
u32 pdn_ack = data->sram_pdn_ack_bits;
u32 val;
int ret, tmp;
if (data->bus_prot_mask) {
- ret = mtk_infracfg_set_bus_protection(scpd->infracfg,
+ ret = mtk_infracfg_set_bus_protection(scpsys->infracfg,
data->bus_prot_mask);
if (ret)
return ret;
@@ -161,16 +161,16 @@ static int mtk_scpsys_power_off(struct power_domain *power_domain)
int mtk_scpsys_probe(struct udevice *dev)
{
struct ofnode_phandle_args args;
- struct mtk_scp_domain *scpd = dev_get_priv(dev);
+ struct mtk_scpsys *scpsys = dev_get_priv(dev);
struct regmap *regmap;
struct clk_bulk bulk;
int err;
- scpd->base = dev_read_addr_ptr(dev);
- if (!scpd->base)
+ scpsys->base = dev_read_addr_ptr(dev);
+ if (!scpsys->base)
return -ENOENT;
- scpd->soc_data = (const struct mtk_scp_soc_data *)dev_get_driver_data(dev);
+ scpsys->soc_data = (const struct mtk_scp_soc_data *)dev_get_driver_data(dev);
/* get corresponding syscon phandle */
err = dev_read_phandle_with_args(dev, "infracfg", NULL, 0, 0, &args);
@@ -181,12 +181,12 @@ int mtk_scpsys_probe(struct udevice *dev)
if (IS_ERR(regmap))
return PTR_ERR(regmap);
- scpd->infracfg = regmap_get_range(regmap, 0);
- if (!scpd->infracfg)
+ scpsys->infracfg = regmap_get_range(regmap, 0);
+ if (!scpsys->infracfg)
return -ENOENT;
/* enable Infra DCM */
- setbits_le32(scpd->infracfg + INFRA_TOPDCM_CTRL, DCM_TOP_EN);
+ setbits_le32(scpsys->infracfg + INFRA_TOPDCM_CTRL, DCM_TOP_EN);
err = clk_get_bulk(dev, &bulk);
if (err)
diff --git a/drivers/power/domain/mtk-power-domain.h b/drivers/power/domain/mtk-power-domain.h
index 830d6947962..689ec4d1657 100644
--- a/drivers/power/domain/mtk-power-domain.h
+++ b/drivers/power/domain/mtk-power-domain.h
@@ -80,7 +80,7 @@ static const struct mtk_scp_soc_data _name##_scp_soc_data = { \
.num_domains = ARRAY_SIZE(_domains), \
}
-struct mtk_scp_domain {
+struct mtk_scpsys {
void __iomem *base;
void __iomem *infracfg;
const struct mtk_scp_soc_data *soc_data;
--
2.54.0
More information about the U-Boot
mailing list