diff options
| author | Simon Horman <horms+renesas@verge.net.au> | 2016-04-22 17:22:21 +1000 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2016-04-22 17:22:21 +1000 |
| commit | a93fed0956bef9e4df420aa181198d86d347895d (patch) | |
| tree | c0527fea578f7ca2ee969f2f9094b529e671aa54 /include/linux | |
| parent | 839a04d847f5871516f500091519c52dc40fe01d (diff) | |
| parent | 2066390ad47b374f3d35075a32325b47d15bf735 (diff) | |
| download | cachepc-linux-a93fed0956bef9e4df420aa181198d86d347895d.tar.gz cachepc-linux-a93fed0956bef9e4df420aa181198d86d347895d.zip | |
Merge tag 'clk-renesas-for-v4.7-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers into rcar-sysc-for-v4.7
clk: renesas: R-Car SYSC PM Domain Preparation
- Export the CPG/MSSR and CPG/MSTP attach/detach_dev callbacks, so
they can be called by the R-Car SYSC PM Domain driver.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/clk/renesas.h | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/include/linux/clk/renesas.h b/include/linux/clk/renesas.h index 7adfd80fbf55..ba6fa4148515 100644 --- a/include/linux/clk/renesas.h +++ b/include/linux/clk/renesas.h @@ -24,12 +24,20 @@ 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); +#ifdef CONFIG_CLK_RENESAS_CPG_MSTP +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); #else -static inline void cpg_mstp_add_clk_domain(struct device_node *np) {} +#define cpg_mstp_attach_dev NULL +#define cpg_mstp_detach_dev NULL #endif +#ifdef CONFIG_CLK_RENESAS_CPG_MSSR +int cpg_mssr_attach_dev(struct generic_pm_domain *unused, struct device *dev); +void cpg_mssr_detach_dev(struct generic_pm_domain *unused, struct device *dev); +#else +#define cpg_mssr_attach_dev NULL +#define cpg_mssr_detach_dev NULL +#endif #endif |