Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

clk: renesas: mstp: 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 MSTP
clocks.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Geert Uytterhoeven 9 years ago
parent
6248620b30
commit
848fc67da5
2 changed files with 0 additions and 7 deletions
Unified View Show Diff Stats
  1. 0 3
      drivers/clk/renesas/clk-mstp.c
  2. 0 4
      include/linux/clk/renesas.h

+ 0 - 3
drivers/clk/renesas/clk-mstp.c
View File 

@@ -243,8 +243,6 @@ static void __init cpg_mstp_clocks_init(struct device_node *np)
 
 }
 
 }
 
 CLK_OF_DECLARE(cpg_mstp_clks, "renesas,cpg-mstp-clocks", cpg_mstp_clocks_init);
 
 CLK_OF_DECLARE(cpg_mstp_clks, "renesas,cpg-mstp-clocks", cpg_mstp_clocks_init);
 
 
 
-
 
-#ifdef CONFIG_PM_GENERIC_DOMAINS_OF
 
 int cpg_mstp_attach_dev(struct generic_pm_domain *domain, struct device *dev)
 
 int cpg_mstp_attach_dev(struct generic_pm_domain *domain, struct device *dev)
 
 {
 
 {
 
 	struct device_node *np = dev->of_node;
 
 	struct device_node *np = dev->of_node;
 
@@ -326,4 +324,3 @@ void __init cpg_mstp_add_clk_domain(struct device_node *np)
 
 
 
 	of_genpd_add_provider_simple(np, pd);
 
 	of_genpd_add_provider_simple(np, pd);
 
 }
 
 }
 
-#endif /* !CONFIG_PM_GENERIC_DOMAINS_OF */

+ 0 - 4
include/linux/clk/renesas.h
View File 

@@ -24,12 +24,8 @@ void r8a7778_clocks_init(u32 mode);
 
 void r8a7779_clocks_init(u32 mode);
 
 void r8a7779_clocks_init(u32 mode);
 
 void rcar_gen2_clocks_init(u32 mode);
 
 void rcar_gen2_clocks_init(u32 mode);
 
 
 
-#ifdef CONFIG_PM_GENERIC_DOMAINS_OF
 
 void cpg_mstp_add_clk_domain(struct device_node *np);
 
 void cpg_mstp_add_clk_domain(struct device_node *np);
 
 int cpg_mstp_attach_dev(struct generic_pm_domain *domain, struct device *dev);
 
 int cpg_mstp_attach_dev(struct generic_pm_domain *domain, struct device *dev);
 
 void cpg_mstp_detach_dev(struct generic_pm_domain *domain, struct device *dev);
 
 void cpg_mstp_detach_dev(struct generic_pm_domain *domain, struct device *dev);
 
-#else
 
-static inline void cpg_mstp_add_clk_domain(struct device_node *np) {}
 
-#endif
 
 
 
 #endif
 
 #endif