p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

soc: mediatek: avoid using fixed spm power status defines 

Use variables to replace fixed defines since the offset
of the status of spm power might be different for some chips

Signed-off-by: Mars Cheng <mars.cheng@mediatek.com>
Signed-off-by: Kevin-CW Chen <kevin-cw.chen@mediatek.com>
Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
This commit is contained in:
Mars Cheng 2017-04-08 09:20:31 +08:00 committed by Matthias Brugger
parent 2ea659a9ef
commit f1be4c4e6c
1 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/soc/mediatek/mtk-scpsys.c
View File

@ -107,21 +107,28 @@ struct scp_domain {
struct regulator *supply; struct regulator *supply;
}; };
struct scp_ctrl_reg {
int pwr_sta_offs;
int pwr_sta2nd_offs;
};
struct scp { struct scp {
struct scp_domain *domains; struct scp_domain *domains;
struct genpd_onecell_data pd_data; struct genpd_onecell_data pd_data;
struct device *dev; struct device *dev;
void __iomem *base; void __iomem *base;
struct regmap *infracfg; struct regmap *infracfg;
struct scp_ctrl_reg ctrl_reg;
}; };
static int scpsys_domain_is_on(struct scp_domain *scpd) static int scpsys_domain_is_on(struct scp_domain *scpd)
{ {
struct scp *scp = scpd->scp; struct scp *scp = scpd->scp;
u32 status = readl(scp->base + SPM_PWR_STATUS) & scpd->data->sta_mask; u32 status = readl(scp->base + scp->ctrl_reg.pwr_sta_offs) &
u32 status2 = readl(scp->base + SPM_PWR_STATUS_2ND) & scpd->data->sta_mask;
scpd->data->sta_mask; u32 status2 = readl(scp->base + scp->ctrl_reg.pwr_sta2nd_offs) &
scpd->data->sta_mask;
/* /*
* A domain is on when both status bits are set. If only one is set * A domain is on when both status bits are set. If only one is set
@ -346,7 +353,8 @@ static void init_clks(struct platform_device *pdev, struct clk **clk)
} }
static struct scp *init_scp(struct platform_device *pdev, static struct scp *init_scp(struct platform_device *pdev,
const struct scp_domain_data *scp_domain_data, int num) const struct scp_domain_data *scp_domain_data, int num,
struct scp_ctrl_reg *scp_ctrl_reg)
{ {
struct genpd_onecell_data *pd_data; struct genpd_onecell_data *pd_data;
struct resource *res; struct resource *res;
@ -358,6 +366,9 @@ static struct scp *init_scp(struct platform_device *pdev,
if (!scp) if (!scp)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
scp->ctrl_reg.pwr_sta_offs = scp_ctrl_reg->pwr_sta_offs;
scp->ctrl_reg.pwr_sta2nd_offs = scp_ctrl_reg->pwr_sta2nd_offs;
scp->dev = &pdev->dev; scp->dev = &pdev->dev;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@ -556,8 +567,13 @@ static const struct scp_domain_data scp_domain_data_mt2701[] = {
static int __init scpsys_probe_mt2701(struct platform_device *pdev) static int __init scpsys_probe_mt2701(struct platform_device *pdev)
{ {
struct scp *scp; struct scp *scp;
struct scp_ctrl_reg scp_reg;
scp = init_scp(pdev, scp_domain_data_mt2701, NUM_DOMAINS_MT2701); scp_reg.pwr_sta_offs = SPM_PWR_STATUS;
scp_reg.pwr_sta2nd_offs = SPM_PWR_STATUS_2ND;
scp = init_scp(pdev, scp_domain_data_mt2701, NUM_DOMAINS_MT2701,
&scp_reg);
if (IS_ERR(scp)) if (IS_ERR(scp))
return PTR_ERR(scp); return PTR_ERR(scp);
@ -667,8 +683,13 @@ static int __init scpsys_probe_mt8173(struct platform_device *pdev)
struct scp *scp; struct scp *scp;
struct genpd_onecell_data *pd_data; struct genpd_onecell_data *pd_data;
int ret; int ret;
struct scp_ctrl_reg scp_reg;
scp = init_scp(pdev, scp_domain_data_mt8173, NUM_DOMAINS_MT8173); scp_reg.pwr_sta_offs = SPM_PWR_STATUS;
scp_reg.pwr_sta2nd_offs = SPM_PWR_STATUS_2ND;
scp = init_scp(pdev, scp_domain_data_mt8173, NUM_DOMAINS_MT8173,
&scp_reg);
if (IS_ERR(scp)) if (IS_ERR(scp))
return PTR_ERR(scp); return PTR_ERR(scp);