Make oxili GDSC parent of oxili_cx GDSC
Subsystems (7)
v2 cover Make oxili GDSC parent of oxili_cx GDSC
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
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(-)
Signature · 2 lines
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
Export these symbols so they can be used in loadable kernel modules.
---
drivers/base/power/domain.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/base/power/domain.c +2 -0
@@ -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. */
Signature · 2 lines
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
Quoted 27 lines · Stephen Boyd
Export these symbols so they can be used in loadable kernel modules.
Cc Rob Clark <[email protected]>Cc Rajendra Nayak <[email protected]>Cc Rafael J. Wysocki <[email protected]>Cc Kevin Hilman <[email protected]>Cc Ulf Hansson <[email protected]>Signed-off-by Stephen Boyd <[email protected]>---
drivers/base/power/domain.c | 2 ++ 1 file changed, 2 insertions(+)drivers/base/power/domain.c +1
-0@@ -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.
drivers/base/power/domain.c out: · line 1401
Quoted 6 lines
drivers/base/power/domain.c +1
-0@@ -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
Quoted 6 lines · Rafael J. Wysocki
Quoted 5 lines · Stephen Boyd
/**
*pm_genpd_remove_subdomain- Remove a subdomain from an I/O PM domain.(quoted diff) +0
-0@@ -1395,6 +1396,7 @@ out:
Quoted 8 lines
drivers/base/power/domain.c out: · line 1401
Quoted 5 lines
drivers/base/power/domain.c +1
-0return 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.
Signature · 2 lines
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
In reply to Stephen BoydThe oxili_cx GDSC is inside the power domain of the oxili GDSC. Add the dependency so that the CX domain can properly power up.
---
drivers/clk/qcom/mmcc-msm8974.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/clk/qcom/mmcc-msm8974.c +10 -1
@@ -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 ; }
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Stephen Boyd
AppliedRe: [PATCH v2 2/2] clk: qcom: Make oxili GDSC parent of oxili_cx GDSC
Quoted 7 lines · Stephen Boyd
The
oxili_cxGDSC 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 <[email protected]>Cc Rajendra Nayak <[email protected]>Signed-off-by Stephen Boyd <[email protected]>---
Applied to clk-next
Signature · 2 lines
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
Quoted 10 lines · Stephen Boyd
Quoted 7 lines · Stephen Boyd
The
oxili_cxGDSC 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 <[email protected]>Cc Rajendra Nayak <[email protected]>Signed-off-by Stephen Boyd <[email protected]>---
Applied to clk-next
I don't see this in clk-next. Was this dropped for some reason?
Signature · 2 lines
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
Quoted 6 lines · Rajendra Nayak
Quoted 4 lines · Stephen Boyd
Quoted 3 lines · Stephen Boyd
The
oxili_cxGDSC is inside the power domain of the oxili GDSC. Add the dependency so that the CX domain can properly power up.
Quoted 9 lines
Quoted 6 lines
Quoted 4 lines
Reported-by Rob Clark <[email protected]>Cc Rajendra Nayak <[email protected]>Signed-off-by Stephen Boyd <[email protected]>---
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.
Signature · 2 lines
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
Quoted 14 lines · Stephen Boyd
Quoted 13 lines · Rajendra Nayak
Quoted 10 lines · Stephen Boyd
Quoted 7 lines · Stephen Boyd
The
oxili_cxGDSC 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 <[email protected]>Cc Rajendra Nayak <[email protected]>Signed-off-by Stephen Boyd <[email protected]>---
Applied to clk-next
Quoted 8 lines
Quoted 2 lines
I don't see this in clk-next. Was this dropped for some reason?
Hm.. It's merged into Linus' tree now
b68f2c3b882202aba97a488c1fede0e99f7261e2unless I missed something.
right, sorry, I seemed to be wrongly looking at the gcc driver instead of mmcc.
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation