[PATCH v2 0/2] Make oxili GDSC parent of oxili_cx GDSC

[PATCH v2 0/2] Make oxili GDSC parent of oxili_cx GDSC

[Stephen Boyd]

I'd like to take these patches through clk tree for v4.4, so PM
maintainers please ack patch 1.

Changes from v1:
 * New patch to export symbols
 * Remove subdomain on driver remove

Cc: Rob Clark <robdclark@gmail.com>
Cc: Rajendra Nayak <rnayak@codeaurora.org>
Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
Cc: Kevin Hilman <khilman@kernel.org>
Cc: Ulf Hansson <ulf.hansson@linaro.org>

Stephen Boyd (2):
  PM / Domains: Make pm_genpd_{add,remove}_subdomain() available to
    modules
  clk: qcom: Make oxili GDSC parent of oxili_cx GDSC

 drivers/base/power/domain.c     |  2 ++
 drivers/clk/qcom/mmcc-msm8974.c | 11 ++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

[PATCH v2 1/2] PM / Domains: Make pm_genpd_{add,remove}_subdomain() available to modules

[Stephen Boyd]

Export these symbols so they can be used in loadable kernel
modules.

Cc: Rob Clark <robdclark@gmail.com>
Cc: Rajendra Nayak <rnayak@codeaurora.org>
Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
Cc: Kevin Hilman <khilman@kernel.org>
Cc: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---

 drivers/base/power/domain.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index cf4950d92937..9b0f5a06a82b 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -1348,6 +1348,7 @@ int pm_genpd_add_subdomain(struct generic_pm_domain *genpd,
 
 	return ret;
 }
+EXPORT_SYMBOL_GPL(pm_genpd_add_subdomain);
 
 /**
  * pm_genpd_remove_subdomain - Remove a subdomain from an I/O PM domain.
@@ -1395,6 +1396,7 @@ out:
 
 	return ret;
 }
+EXPORT_SYMBOL_GPL(pm_genpd_remove_subdomain);
 
 /* Default device callbacks for generic PM domains. */
 
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

Re: [PATCH v2 1/2] PM / Domains: Make pm_genpd_{add,remove}_subdomain() available to modules

[Rafael J. Wysocki]

On Thursday, October 01, 2015 12:22:53 PM Stephen Boyd wrote:
> Export these symbols so they can be used in loadable kernel
> modules.
> 
> Cc: Rob Clark <robdclark@gmail.com>
> Cc: Rajendra Nayak <rnayak@codeaurora.org>
> Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
> Cc: Kevin Hilman <khilman@kernel.org>
> Cc: Ulf Hansson <ulf.hansson@linaro.org>
> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
> ---
> 
>  drivers/base/power/domain.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
> index cf4950d92937..9b0f5a06a82b 100644
> --- a/drivers/base/power/domain.c
> +++ b/drivers/base/power/domain.c
> @@ -1348,6 +1348,7 @@ int pm_genpd_add_subdomain(struct generic_pm_domain *genpd,
>  
>  	return ret;
>  }
> +EXPORT_SYMBOL_GPL(pm_genpd_add_subdomain);
>  
>  /**
>   * pm_genpd_remove_subdomain - Remove a subdomain from an I/O PM domain.
> @@ -1395,6 +1396,7 @@ out:
>  
>  	return ret;
>  }
> +EXPORT_SYMBOL_GPL(pm_genpd_remove_subdomain);
>  
>  /* Default device callbacks for generic PM domains. */

This is fine by me, please feel free to add my ACK to it.

Thanks,
Rafael

Re: [PATCH v2 1/2] PM / Domains: Make pm_genpd_{add,remove}_subdomain() available to modules

[Stephen Boyd]

On 10/05, Rafael J. Wysocki wrote:
> On Thursday, October 01, 2015 12:22:53 PM Stephen Boyd wrote:
> >  
> >  /**
> >   * pm_genpd_remove_subdomain - Remove a subdomain from an I/O PM domain.
> > @@ -1395,6 +1396,7 @@ out:
> >  
> >  	return ret;
> >  }
> > +EXPORT_SYMBOL_GPL(pm_genpd_remove_subdomain);
> >  
> >  /* Default device callbacks for generic PM domains. */
> 
> This is fine by me, please feel free to add my ACK to it.
> 

Thanks. Applied to clk-next.

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project

[PATCH v2 2/2] clk: qcom: Make oxili GDSC parent of oxili_cx GDSC

[Stephen Boyd]

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(-)

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 Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

Re: [PATCH v2 2/2] clk: qcom: Make oxili GDSC parent of oxili_cx GDSC

[Stephen Boyd]

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

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project

Re: [PATCH v2 2/2] clk: qcom: Make oxili GDSC parent of oxili_cx GDSC

[Rajendra Nayak]

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?

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
hosted by The Linux Foundation

Re: [PATCH v2 2/2] clk: qcom: Make oxili GDSC parent of oxili_cx GDSC

[Stephen Boyd]

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.

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project

Re: [PATCH v2 2/2] clk: qcom: Make oxili GDSC parent of oxili_cx GDSC

[Rajendra Nayak]

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.

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
hosted by The Linux Foundation