clk: qcom: mmcc8974: Use gdscs .parent and remove genpd calls

With gdsc driver capable of handling hierarchical power domains,
specify oxili_gdsc as parent of oxilicx_gdsc.

Remove all direct calls to genpd from the mmcc clock driver. The
adding and removing of subdomains is now handled from within
the gdsc driver.

Signed-off-by: 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 bbe28ed936692da75079aace6aa1cbc1e2ce23e4..bcda56e81503a822bb9612e678e6b7b009c3bf63 100644 (file)
--- a/drivers/clk/qcom/mmcc-msm8974.c
+++ b/drivers/clk/qcom/mmcc-msm8974.c
@@ -2400,6 +2400,7 @@ static struct gdsc oxilicx_gdsc = {
        .pd = {
                .name = "oxilicx",
        },
+       .parent = &oxili_gdsc.pd,
        .pwrsts = PWRSTS_OFF_ON,
 };
 
@@ -2616,7 +2617,6 @@ 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))
@@ -2625,22 +2625,11 @@ 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);
 
-       ret = qcom_cc_really_probe(pdev, &mmcc_msm8974_desc, regmap);
-       if (ret)
-               return ret;
-
-       return pm_genpd_add_subdomain(&oxili_gdsc.pd, &oxilicx_gdsc.pd);
-}
-
-static int mmcc_msm8974_remove(struct platform_device *pdev)
-{
-       pm_genpd_remove_subdomain(&oxili_gdsc.pd, &oxilicx_gdsc.pd);
-       return 0;
+       return qcom_cc_really_probe(pdev, &mmcc_msm8974_desc, regmap);
 }
 
 static struct platform_driver mmcc_msm8974_driver = {
        .probe          = mmcc_msm8974_probe,
-       .remove         = mmcc_msm8974_remove,
        .driver         = {
                .name   = "mmcc-msm8974",
                .of_match_table = mmcc_msm8974_match_table,