aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Hunter <jonathanh@nvidia.com>2016-09-12 07:01:06 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-09-12 20:49:33 -0400
commit8d68c3713aa6dcf4f65f7fa8f0b6f692ace18d07 (patch)
tree9c1c3ea0b9ae62eecfa4921a182a10fd1b4c5504
parentec69572b3f0daf1f26b3e563d56e487d515a3cd1 (diff)
ARM: EXYNOS: Remove calls to of_genpd_get_from_provider()
Update the EXYNOS PM domain code to use the of_genpd_add_subdomain() and remove any calls to of_genpd_get_from_provider(). Signed-off-by: Jon Hunter <jonathanh@nvidia.com> Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Acked-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--drivers/soc/samsung/pm_domains.c23
1 files changed, 8 insertions, 15 deletions
diff --git a/drivers/soc/samsung/pm_domains.c b/drivers/soc/samsung/pm_domains.c
index 4822346aadc6..7112004b8032 100644
--- a/drivers/soc/samsung/pm_domains.c
+++ b/drivers/soc/samsung/pm_domains.c
@@ -215,29 +215,22 @@ no_clk:
215 215
216 /* Assign the child power domains to their parents */ 216 /* Assign the child power domains to their parents */
217 for_each_matching_node(np, exynos_pm_domain_of_match) { 217 for_each_matching_node(np, exynos_pm_domain_of_match) {
218 struct generic_pm_domain *child_domain, *parent_domain; 218 struct of_phandle_args child, parent;
219 struct of_phandle_args args;
220 219
221 args.np = np; 220 child.np = np;
222 args.args_count = 0; 221 child.args_count = 0;
223 child_domain = of_genpd_get_from_provider(&args);
224 if (IS_ERR(child_domain))
225 continue;
226 222
227 if (of_parse_phandle_with_args(np, "power-domains", 223 if (of_parse_phandle_with_args(np, "power-domains",
228 "#power-domain-cells", 0, &args) != 0) 224 "#power-domain-cells", 0,
229 continue; 225 &parent) != 0)
230
231 parent_domain = of_genpd_get_from_provider(&args);
232 if (IS_ERR(parent_domain))
233 continue; 226 continue;
234 227
235 if (pm_genpd_add_subdomain(parent_domain, child_domain)) 228 if (of_genpd_add_subdomain(&parent, &child))
236 pr_warn("%s failed to add subdomain: %s\n", 229 pr_warn("%s failed to add subdomain: %s\n",
237 parent_domain->name, child_domain->name); 230 parent.np->name, child.np->name);
238 else 231 else
239 pr_info("%s has as child subdomain: %s.\n", 232 pr_info("%s has as child subdomain: %s.\n",
240 parent_domain->name, child_domain->name); 233 parent.np->name, child.np->name);
241 } 234 }
242 235
243 return 0; 236 return 0;