Merge branch 'clk-renesas-for-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers into clk-next
Pull renesas clk driver updates from Geert Uytterhoeven: - Support for the PWM module clock and watchdog related clocks on R-Car H3, - Cleanups and clarifications. * 'clk-renesas-for-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers: clk: renesas: mstp: Clarify cpg_mstp_{at,de}tach_dev() domain parameter clk: renesas: cpg-mssr: Drop check for CONFIG_PM_GENERIC_DOMAINS_OF clk: renesas: mstp: Drop check for CONFIG_PM_GENERIC_DOMAINS_OF clk: renesas: r8a7795: add RWDT clock clk: renesas: r8a7795: add R clk clk: renesas: r8a7795: add OSC and RINT clocks clk: renesas: cpg-mssr: add generic support for read-only DIV6 clocks clk: renesas: r8a7795: make SD clk definition specific for GEN3 clk: renesas: r8a7795: add PWM clock
This commit is contained in:
@@ -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
|
||||
int cpg_mstp_attach_dev(struct generic_pm_domain *unused, struct device *dev);
|
||||
void cpg_mstp_detach_dev(struct generic_pm_domain *unused, struct device *dev);
|
||||
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user