diff options
| author | Dhaval Patel <pdhaval@codeaurora.org> | 2015-05-06 10:51:35 -0700 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-23 20:40:59 -0700 |
| commit | bce01b2e9d90388a207f2872def6be024eef0f36 (patch) | |
| tree | 5d61ca3f4522af25e26b9e5ae9521cc30998f7cb | |
| parent | fae000ced6efc79a0c94293509d6e66dbc89f697 (diff) | |
Revert "msm: mdss: enable mmagic gdsc before turning on mdp gdsc"
This reverts commit 3c2ffe73f03a1bfced4239b16d3284b2397f392c.
Clock change added support to handle the mmagic gdsc as
parent of core gdsc. This removes the requirement from
each mm core to vote explicitly for mmagic gdsc.
Change-Id: I10e0b3cc9bcb2bd5f4a850e1b8800b45f7305d67
Signed-off-by: Dhaval Patel <pdhaval@codeaurora.org>
[cip@codeaurora.org: Removed dtsi updates]
Signed-off-by: Clarence Ip <cip@codeaurora.org>
| -rw-r--r-- | drivers/video/fbdev/msm/mdss.h | 1 | ||||
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp.c | 25 |
2 files changed, 0 insertions, 26 deletions
diff --git a/drivers/video/fbdev/msm/mdss.h b/drivers/video/fbdev/msm/mdss.h index 593b8f74d684..5f6fec9b1499 100644 --- a/drivers/video/fbdev/msm/mdss.h +++ b/drivers/video/fbdev/msm/mdss.h @@ -206,7 +206,6 @@ struct mdss_data_type { u32 mdp_rev; struct clk *mdp_clk[MDSS_MAX_CLK]; struct regulator *fs; - struct regulator *mmagic_mdss; struct regulator *vdd_cx; bool batfet_required; struct regulator *batfet; diff --git a/drivers/video/fbdev/msm/mdss_mdp.c b/drivers/video/fbdev/msm/mdss_mdp.c index c1663b7ecb90..e9302b100c8d 100644 --- a/drivers/video/fbdev/msm/mdss_mdp.c +++ b/drivers/video/fbdev/msm/mdss_mdp.c @@ -943,14 +943,6 @@ static int mdss_mdp_irq_clk_setup(struct mdss_data_type *mdata) pr_err("unable to get gdsc regulator\n"); return -EINVAL; } - - mdata->mmagic_mdss = devm_regulator_get(&mdata->pdev->dev, - "gdsc-mmagic-mdss"); - if (IS_ERR_OR_NULL(mdata->mmagic_mdss)) { - mdata->mmagic_mdss = NULL; - pr_debug("unable to get mmagic gdsc regulator\n"); - } - mdata->fs_ena = false; mdata->gdsc_cb.notifier_call = mdss_mdp_gdsc_notifier_call; @@ -1211,12 +1203,6 @@ void mdss_mdp_footswitch_ctrl_splash(int on) if (mdata != NULL) { if (on) { pr_debug("Enable MDP FS for splash.\n"); - if (mdata->mmagic_mdss) { - ret = regulator_enable(mdata->mmagic_mdss); - if (ret) - pr_err("Mmagic MDSS failed to enable\n"); - } - ret = regulator_enable(mdata->fs); if (ret) pr_err("Footswitch failed to enable\n"); @@ -1226,8 +1212,6 @@ void mdss_mdp_footswitch_ctrl_splash(int on) pr_debug("Disable MDP FS for splash.\n"); mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_OFF); regulator_disable(mdata->fs); - if (mdata->mmagic_mdss) - regulator_disable(mdata->mmagic_mdss); mdata->handoff_pending = false; } } else { @@ -3513,16 +3497,9 @@ static void mdss_mdp_footswitch_ctrl(struct mdss_data_type *mdata, int on) if (on) { if (!mdata->fs_ena) { pr_debug("Enable MDP FS\n"); - if (mdata->mmagic_mdss) { - ret = regulator_enable(mdata->mmagic_mdss); - if (ret) - pr_warn("mmagic mdss failed to enable\n"); - } - ret = regulator_enable(mdata->fs); if (ret) pr_warn("Footswitch failed to enable\n"); - if (!mdata->idle_pc) { mdss_mdp_cx_ctrl(mdata, true); mdss_mdp_batfet_ctrl(mdata, true); @@ -3550,8 +3527,6 @@ static void mdss_mdp_footswitch_ctrl(struct mdss_data_type *mdata, int on) if (mdata->en_svs_high) mdss_mdp_config_cx_voltage(mdata, false); regulator_disable(mdata->fs); - if (mdata->mmagic_mdss) - regulator_disable(mdata->mmagic_mdss); } mdata->fs_ena = false; } |