diff options
author | Geert Uytterhoeven <geert+renesas@glider.be> | 2016-03-04 09:36:33 -0500 |
---|---|---|
committer | Geert Uytterhoeven <geert+renesas@glider.be> | 2016-04-07 11:27:10 -0400 |
commit | da437d2d09de0af1ffd7ae3d88317ef1bf7f9456 (patch) | |
tree | 36cd99b15267116a9544baa7f4b473124e1abf4b | |
parent | 848fc67da5fb43ef7d92d20891eef79f5de45816 (diff) |
clk: renesas: cpg-mssr: Drop check for CONFIG_PM_GENERIC_DOMAINS_OF
As of commit 71d076ceb245f0d9 ("ARM: shmobile: Enable PM and
PM_GENERIC_DOMAINS for SoCs with PM Domains"),
CONFIG_PM_GENERIC_DOMAINS_OF is always enabled for SoCs with a CPG/MSSR
block.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-rw-r--r-- | drivers/clk/renesas/renesas-cpg-mssr.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/clk/renesas/renesas-cpg-mssr.c b/drivers/clk/renesas/renesas-cpg-mssr.c index 3e4d2609cc02..703bdb157528 100644 --- a/drivers/clk/renesas/renesas-cpg-mssr.c +++ b/drivers/clk/renesas/renesas-cpg-mssr.c | |||
@@ -381,8 +381,6 @@ fail: | |||
381 | kfree(clock); | 381 | kfree(clock); |
382 | } | 382 | } |
383 | 383 | ||
384 | |||
385 | #ifdef CONFIG_PM_GENERIC_DOMAINS_OF | ||
386 | struct cpg_mssr_clk_domain { | 384 | struct cpg_mssr_clk_domain { |
387 | struct generic_pm_domain genpd; | 385 | struct generic_pm_domain genpd; |
388 | struct device_node *np; | 386 | struct device_node *np; |
@@ -497,15 +495,6 @@ static int __init cpg_mssr_add_clk_domain(struct device *dev, | |||
497 | of_genpd_add_provider_simple(np, genpd); | 495 | of_genpd_add_provider_simple(np, genpd); |
498 | return 0; | 496 | return 0; |
499 | } | 497 | } |
500 | #else | ||
501 | static inline int cpg_mssr_add_clk_domain(struct device *dev, | ||
502 | const unsigned int *core_pm_clks, | ||
503 | unsigned int num_core_pm_clks) | ||
504 | { | ||
505 | return 0; | ||
506 | } | ||
507 | #endif /* !CONFIG_PM_GENERIC_DOMAINS_OF */ | ||
508 | |||
509 | 498 | ||
510 | static const struct of_device_id cpg_mssr_match[] = { | 499 | static const struct of_device_id cpg_mssr_match[] = { |
511 | #ifdef CONFIG_ARCH_R8A7795 | 500 | #ifdef CONFIG_ARCH_R8A7795 |