summaryrefslogtreecommitdiffstats
path: root/drivers/clk
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2016-03-04 15:36:33 +0100
committerGeert Uytterhoeven <geert+renesas@glider.be>2016-04-07 17:27:10 +0200
commitda437d2d09de0af1ffd7ae3d88317ef1bf7f9456 (patch)
tree36cd99b15267116a9544baa7f4b473124e1abf4b /drivers/clk
parentclk: renesas: mstp: Drop check for CONFIG_PM_GENERIC_DOMAINS_OF (diff)
downloadlinux-da437d2d09de0af1ffd7ae3d88317ef1bf7f9456.tar.xz
linux-da437d2d09de0af1ffd7ae3d88317ef1bf7f9456.zip
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>
Diffstat (limited to 'drivers/clk')
-rw-r--r--drivers/clk/renesas/renesas-cpg-mssr.c11
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:
kfree(clock);
}
-
-#ifdef CONFIG_PM_GENERIC_DOMAINS_OF
struct cpg_mssr_clk_domain {
struct generic_pm_domain genpd;
struct device_node *np;
@@ -497,15 +495,6 @@ static int __init cpg_mssr_add_clk_domain(struct device *dev,
of_genpd_add_provider_simple(np, genpd);
return 0;
}
-#else
-static inline int cpg_mssr_add_clk_domain(struct device *dev,
- const unsigned int *core_pm_clks,
- unsigned int num_core_pm_clks)
-{
- return 0;
-}
-#endif /* !CONFIG_PM_GENERIC_DOMAINS_OF */
-
static const struct of_device_id cpg_mssr_match[] = {
#ifdef CONFIG_ARCH_R8A7795