diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2015-10-01 12:22:54 -0700 |
|---|---|---|
| committer | Stephen Boyd <sboyd@codeaurora.org> | 2015-10-08 23:52:56 -0700 |
| commit | b68f2c3b882202aba97a488c1fede0e99f7261e2 (patch) | |
| tree | ab8a2f79b313542b64923fbe98806e7dc0102a7d | |
| parent | d60ee966b260331d1e76f73cd97f9563d2278b10 (diff) | |
| download | linux-b68f2c3b882202aba97a488c1fede0e99f7261e2.tar.gz | |
clk: qcom: Make oxili GDSC parent of oxili_cx GDSC
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>
| -rw-r--r-- | drivers/clk/qcom/mmcc-msm8974.c | 11 |
1 files changed, 10 insertions, 1 deletions
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; } |