diff options
| author | Simon Horman <horms+renesas@verge.net.au> | 2016-04-27 11:35:26 +1000 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2016-04-27 11:35:26 +1000 |
| commit | 03ef285fd75f0a47461048832367ea71ec1bc65b (patch) | |
| tree | cdf15d7440fc80f4ad23b05138d909d70a8f583e /include/linux | |
| parent | 6f92cb2f454c26d9bdada902e22af4bc361a5202 (diff) | |
| parent | 23f1e2ecdecee9f2ec45de0a468b82bb1f7f3ca2 (diff) | |
| download | cachepc-linux-03ef285fd75f0a47461048832367ea71ec1bc65b.tar.gz cachepc-linux-03ef285fd75f0a47461048832367ea71ec1bc65b.zip | |
Merge tag 'renesas-rcar-sysc2-for-v4.7' into dt-pm-domain-for-v4.7
Second Round of Renesas ARM Based SoC R-Car SYSC Updates for v4.7
Introduce a DT-based driver for the R-Car System Controller, as found on
Renesas R-Car H1, R-Car Gen2, and R-Car Gen3 SoCs.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/clk/renesas.h | 16 | ||||
| -rw-r--r-- | include/linux/soc/renesas/rcar-sysc.h | 16 |
2 files changed, 28 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 diff --git a/include/linux/soc/renesas/rcar-sysc.h b/include/linux/soc/renesas/rcar-sysc.h new file mode 100644 index 000000000000..92fc613ab23d --- /dev/null +++ b/include/linux/soc/renesas/rcar-sysc.h @@ -0,0 +1,16 @@ +#ifndef __LINUX_SOC_RENESAS_RCAR_SYSC_H__ +#define __LINUX_SOC_RENESAS_RCAR_SYSC_H__ + +#include <linux/types.h> + +struct rcar_sysc_ch { + u16 chan_offs; + u8 chan_bit; + u8 isr_bit; +}; + +int rcar_sysc_power_down(const struct rcar_sysc_ch *sysc_ch); +int rcar_sysc_power_up(const struct rcar_sysc_ch *sysc_ch); +void __iomem *rcar_sysc_init(phys_addr_t base); + +#endif /* __LINUX_SOC_RENESAS_RCAR_SYSC_H__ */ |