Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 848fc67d authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

clk: renesas: mstp: Drop check for CONFIG_PM_GENERIC_DOMAINS_OF 



As of commit 71d076ce ("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: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
parent 6248620b

drivers/clk/renesas/clk-mstp.c

+0 −3
Original line number Diff line number Diff line
@@ -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);





#ifdef CONFIG_PM_GENERIC_DOMAINS_OF

int cpg_mstp_attach_dev(struct generic_pm_domain *domain, struct device *dev)

{

	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);

}
 
#endif /* !CONFIG_PM_GENERIC_DOMAINS_OF */

include/linux/clk/renesas.h

+0 −4
Original line number Diff line number Diff line
@@ -24,12 +24,8 @@ void r8a7778_clocks_init(u32 mode); 
void r8a7779_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);

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);

#else

static inline void cpg_mstp_add_clk_domain(struct device_node *np) {}

#endif



#endif