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>

diff --git a/drivers/clk/qcom/mmcc-msm8974.c b/drivers/clk/qcom/mmcc-msm8974.c
index fe8320dc41db9b8f0098957a0f46bb6b347463d4..cf2a7c9c95e6625be94a2dde6b269b71f086a615 100644 (file)
--- 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;
 }