| Message ID | 1443727374-1539-3-git-send-email-sboyd@codeaurora.org (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On 10/01, Stephen Boyd wrote: > The oxili_cx GDSC is inside the power domain of the oxili GDSC. > Add the dependency so that the CX domain can properly power up. > > Reported-by: Rob Clark <robdclark@gmail.com> > Cc: Rajendra Nayak <rnayak@codeaurora.org> > Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> > --- Applied to clk-next
On 10/07/2015 01:02 AM, Stephen Boyd wrote: > On 10/01, Stephen Boyd wrote: >> The oxili_cx GDSC is inside the power domain of the oxili GDSC. >> Add the dependency so that the CX domain can properly power up. >> >> Reported-by: Rob Clark <robdclark@gmail.com> >> Cc: Rajendra Nayak <rnayak@codeaurora.org> >> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> >> --- > > Applied to clk-next I don't see this in clk-next. Was this dropped for some reason?
On 11/13, Rajendra Nayak wrote: > > On 10/07/2015 01:02 AM, Stephen Boyd wrote: > > On 10/01, Stephen Boyd wrote: > >> The oxili_cx GDSC is inside the power domain of the oxili GDSC. > >> Add the dependency so that the CX domain can properly power up. > >> > >> Reported-by: Rob Clark <robdclark@gmail.com> > >> Cc: Rajendra Nayak <rnayak@codeaurora.org> > >> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> > >> --- > > > > Applied to clk-next > > I don't see this in clk-next. Was this dropped for some reason? > Hm.. It's merged into Linus' tree now b68f2c3b882202aba97a488c1fede0e99f7261e2 unless I missed something.
On 11/13/2015 11:44 AM, Stephen Boyd wrote: > On 11/13, Rajendra Nayak wrote: >> >> On 10/07/2015 01:02 AM, Stephen Boyd wrote: >>> On 10/01, Stephen Boyd wrote: >>>> The oxili_cx GDSC is inside the power domain of the oxili GDSC. >>>> Add the dependency so that the CX domain can properly power up. >>>> >>>> Reported-by: Rob Clark <robdclark@gmail.com> >>>> Cc: Rajendra Nayak <rnayak@codeaurora.org> >>>> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> >>>> --- >>> >>> Applied to clk-next >> >> I don't see this in clk-next. Was this dropped for some reason? >> > > Hm.. It's merged into Linus' tree now > > b68f2c3b882202aba97a488c1fede0e99f7261e2 > > unless I missed something. right, sorry, I seemed to be wrongly looking at the gcc driver instead of mmcc.
diff --git a/drivers/clk/qcom/mmcc-msm8974.c b/drivers/clk/qcom/mmcc-msm8974.c index fe8320dc41db..cf2a7c9c95e6 100644 --- a/drivers/clk/qcom/mmcc-msm8974.c +++ b/drivers/clk/qcom/mmcc-msm8974.c @@ -2615,6 +2615,7 @@ MODULE_DEVICE_TABLE(of, mmcc_msm8974_match_table); static int mmcc_msm8974_probe(struct platform_device *pdev) { struct regmap *regmap; + int ret; regmap = qcom_cc_map(pdev, &mmcc_msm8974_desc); if (IS_ERR(regmap)) @@ -2623,11 +2624,19 @@ static int mmcc_msm8974_probe(struct platform_device *pdev) clk_pll_configure_sr_hpm_lp(&mmpll1, regmap, &mmpll1_config, true); clk_pll_configure_sr_hpm_lp(&mmpll3, regmap, &mmpll3_config, false); - return qcom_cc_really_probe(pdev, &mmcc_msm8974_desc, regmap); + ret = qcom_cc_really_probe(pdev, &mmcc_msm8974_desc, regmap); + if (ret) + return ret; + + ret = pm_genpd_add_subdomain(&oxili_gdsc.pd, &oxilicx_gdsc.pd); + if (ret) + qcom_cc_remove(pdev); + return ret; } static int mmcc_msm8974_remove(struct platform_device *pdev) { + pm_genpd_remove_subdomain(&oxili_gdsc.pd, &oxilicx_gdsc.pd); qcom_cc_remove(pdev); return 0; }
The oxili_cx GDSC is inside the power domain of the oxili GDSC. Add the dependency so that the CX domain can properly power up. Reported-by: Rob Clark <robdclark@gmail.com> Cc: Rajendra Nayak <rnayak@codeaurora.org> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> --- drivers/clk/qcom/mmcc-msm8974.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)