mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
remoteproc: qcom_q6v5_mss: Allow replacing regulators with power domains
Newer platforms vote for necessary power domains through the power domain subsystem. For historical reasons older platforms like MSM8916 or MSM8974 still control these as regulators. Managing them as power domains is preferred since that allows us to vote for corners instead of raw voltages. Make it possible for MSM8916 and MSM8974 to manage these as power domains. For compatibility with old device trees we still need to support falling back to the regulators when necessary. The way this is implemented here is that the deprecated regulators are defined as "fallback_proxy_supply". Only if attaching the power domains fails because they are not specified (-ENODATA) we request and manage the fallback regulators instead. Signed-off-by: Stephan Gerhold <stephan@gerhold.net> Link: https://lore.kernel.org/r/20200916104135.25085-7-stephan@gerhold.net Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
This commit is contained in:
parent
0711ae454b
commit
8750cf3923
1 changed files with 56 additions and 12 deletions
|
@ -132,6 +132,7 @@ struct qcom_mss_reg_res {
|
|||
struct rproc_hexagon_res {
|
||||
const char *hexagon_mba_image;
|
||||
struct qcom_mss_reg_res *proxy_supply;
|
||||
struct qcom_mss_reg_res *fallback_proxy_supply;
|
||||
struct qcom_mss_reg_res *active_supply;
|
||||
char **proxy_clk_names;
|
||||
char **reset_clk_names;
|
||||
|
@ -177,9 +178,11 @@ struct q6v5 {
|
|||
int proxy_pd_count;
|
||||
|
||||
struct reg_info active_regs[1];
|
||||
struct reg_info proxy_regs[3];
|
||||
struct reg_info proxy_regs[1];
|
||||
struct reg_info fallback_proxy_regs[2];
|
||||
int active_reg_count;
|
||||
int proxy_reg_count;
|
||||
int fallback_proxy_reg_count;
|
||||
|
||||
bool dump_mba_loaded;
|
||||
size_t current_dump_size;
|
||||
|
@ -890,11 +893,18 @@ static int q6v5_mba_load(struct q6v5 *qproc)
|
|||
goto disable_active_pds;
|
||||
}
|
||||
|
||||
ret = q6v5_regulator_enable(qproc, qproc->fallback_proxy_regs,
|
||||
qproc->fallback_proxy_reg_count);
|
||||
if (ret) {
|
||||
dev_err(qproc->dev, "failed to enable fallback proxy supplies\n");
|
||||
goto disable_proxy_pds;
|
||||
}
|
||||
|
||||
ret = q6v5_regulator_enable(qproc, qproc->proxy_regs,
|
||||
qproc->proxy_reg_count);
|
||||
if (ret) {
|
||||
dev_err(qproc->dev, "failed to enable proxy supplies\n");
|
||||
goto disable_proxy_pds;
|
||||
goto disable_fallback_proxy_reg;
|
||||
}
|
||||
|
||||
ret = q6v5_clk_enable(qproc->dev, qproc->proxy_clks,
|
||||
|
@ -1008,6 +1018,9 @@ static int q6v5_mba_load(struct q6v5 *qproc)
|
|||
disable_proxy_reg:
|
||||
q6v5_regulator_disable(qproc, qproc->proxy_regs,
|
||||
qproc->proxy_reg_count);
|
||||
disable_fallback_proxy_reg:
|
||||
q6v5_regulator_disable(qproc, qproc->fallback_proxy_regs,
|
||||
qproc->fallback_proxy_reg_count);
|
||||
disable_proxy_pds:
|
||||
q6v5_pds_disable(qproc, qproc->proxy_pds, qproc->proxy_pd_count);
|
||||
disable_active_pds:
|
||||
|
@ -1063,6 +1076,8 @@ static void q6v5_mba_reclaim(struct q6v5 *qproc)
|
|||
qproc->proxy_pd_count);
|
||||
q6v5_clk_disable(qproc->dev, qproc->proxy_clks,
|
||||
qproc->proxy_clk_count);
|
||||
q6v5_regulator_disable(qproc, qproc->fallback_proxy_regs,
|
||||
qproc->fallback_proxy_reg_count);
|
||||
q6v5_regulator_disable(qproc, qproc->proxy_regs,
|
||||
qproc->proxy_reg_count);
|
||||
}
|
||||
|
@ -1423,6 +1438,8 @@ static void qcom_msa_handover(struct qcom_q6v5 *q6v5)
|
|||
qproc->proxy_clk_count);
|
||||
q6v5_regulator_disable(qproc, qproc->proxy_regs,
|
||||
qproc->proxy_reg_count);
|
||||
q6v5_regulator_disable(qproc, qproc->fallback_proxy_regs,
|
||||
qproc->fallback_proxy_reg_count);
|
||||
q6v5_pds_disable(qproc, qproc->proxy_pds, qproc->proxy_pd_count);
|
||||
}
|
||||
|
||||
|
@ -1717,11 +1734,22 @@ static int q6v5_probe(struct platform_device *pdev)
|
|||
|
||||
ret = q6v5_pds_attach(&pdev->dev, qproc->proxy_pds,
|
||||
desc->proxy_pd_names);
|
||||
if (ret < 0) {
|
||||
/* Fallback to regulators for old device trees */
|
||||
if (ret == -ENODATA && desc->fallback_proxy_supply) {
|
||||
ret = q6v5_regulator_init(&pdev->dev,
|
||||
qproc->fallback_proxy_regs,
|
||||
desc->fallback_proxy_supply);
|
||||
if (ret < 0) {
|
||||
dev_err(&pdev->dev, "Failed to get fallback proxy regulators.\n");
|
||||
goto detach_active_pds;
|
||||
}
|
||||
qproc->fallback_proxy_reg_count = ret;
|
||||
} else if (ret < 0) {
|
||||
dev_err(&pdev->dev, "Failed to init power domains\n");
|
||||
goto detach_active_pds;
|
||||
} else {
|
||||
qproc->proxy_pd_count = ret;
|
||||
}
|
||||
qproc->proxy_pd_count = ret;
|
||||
|
||||
qproc->has_alt_reset = desc->has_alt_reset;
|
||||
ret = q6v5_init_reset(qproc);
|
||||
|
@ -1922,6 +1950,13 @@ static const struct rproc_hexagon_res msm8996_mss = {
|
|||
static const struct rproc_hexagon_res msm8916_mss = {
|
||||
.hexagon_mba_image = "mba.mbn",
|
||||
.proxy_supply = (struct qcom_mss_reg_res[]) {
|
||||
{
|
||||
.supply = "pll",
|
||||
.uA = 100000,
|
||||
},
|
||||
{}
|
||||
},
|
||||
.fallback_proxy_supply = (struct qcom_mss_reg_res[]) {
|
||||
{
|
||||
.supply = "mx",
|
||||
.uV = 1050000,
|
||||
|
@ -1930,10 +1965,6 @@ static const struct rproc_hexagon_res msm8916_mss = {
|
|||
.supply = "cx",
|
||||
.uA = 100000,
|
||||
},
|
||||
{
|
||||
.supply = "pll",
|
||||
.uA = 100000,
|
||||
},
|
||||
{}
|
||||
},
|
||||
.proxy_clk_names = (char*[]){
|
||||
|
@ -1946,6 +1977,11 @@ static const struct rproc_hexagon_res msm8916_mss = {
|
|||
"mem",
|
||||
NULL
|
||||
},
|
||||
.proxy_pd_names = (char*[]){
|
||||
"mx",
|
||||
"cx",
|
||||
NULL
|
||||
},
|
||||
.need_mem_protection = false,
|
||||
.has_alt_reset = false,
|
||||
.has_mba_logs = false,
|
||||
|
@ -1956,6 +1992,13 @@ static const struct rproc_hexagon_res msm8916_mss = {
|
|||
static const struct rproc_hexagon_res msm8974_mss = {
|
||||
.hexagon_mba_image = "mba.b00",
|
||||
.proxy_supply = (struct qcom_mss_reg_res[]) {
|
||||
{
|
||||
.supply = "pll",
|
||||
.uA = 100000,
|
||||
},
|
||||
{}
|
||||
},
|
||||
.fallback_proxy_supply = (struct qcom_mss_reg_res[]) {
|
||||
{
|
||||
.supply = "mx",
|
||||
.uV = 1050000,
|
||||
|
@ -1964,10 +2007,6 @@ static const struct rproc_hexagon_res msm8974_mss = {
|
|||
.supply = "cx",
|
||||
.uA = 100000,
|
||||
},
|
||||
{
|
||||
.supply = "pll",
|
||||
.uA = 100000,
|
||||
},
|
||||
{}
|
||||
},
|
||||
.active_supply = (struct qcom_mss_reg_res[]) {
|
||||
|
@ -1988,6 +2027,11 @@ static const struct rproc_hexagon_res msm8974_mss = {
|
|||
"mem",
|
||||
NULL
|
||||
},
|
||||
.proxy_pd_names = (char*[]){
|
||||
"mx",
|
||||
"cx",
|
||||
NULL
|
||||
},
|
||||
.need_mem_protection = false,
|
||||
.has_alt_reset = false,
|
||||
.has_mba_logs = false,
|
||||
|
|
Loading…
Reference in a new issue