diff options
Diffstat (limited to 'include/linux/clk-provider.h')
| -rw-r--r-- | include/linux/clk-provider.h | 61 | 
1 files changed, 58 insertions, 3 deletions
| diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h index 7f197d7addb..9fdfae74d66 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h @@ -45,6 +45,14 @@ struct clk_hw;   * 		undo any work done in the @prepare callback. Called with   * 		prepare_lock held.   * + * @is_prepared: Queries the hardware to determine if the clock is prepared. + *		This function is allowed to sleep. Optional, if this op is not + *		set then the prepare count will be used. + * + * @unprepare_unused: Unprepare the clock atomically.  Only called from + *		clk_disable_unused for prepare clocks with special needs. + *		Called with prepare mutex held. This function may sleep. + *   * @enable:	Enable the clock atomically. This must not return until the   * 		clock is generating a valid clock signal, usable by consumer   * 		devices. Called with enable_lock held. This function must not @@ -108,6 +116,8 @@ struct clk_hw;  struct clk_ops {  	int		(*prepare)(struct clk_hw *hw);  	void		(*unprepare)(struct clk_hw *hw); +	int		(*is_prepared)(struct clk_hw *hw); +	void		(*unprepare_unused)(struct clk_hw *hw);  	int		(*enable)(struct clk_hw *hw);  	void		(*disable)(struct clk_hw *hw);  	int		(*is_enabled)(struct clk_hw *hw); @@ -239,9 +249,14 @@ struct clk_div_table {   * CLK_DIVIDER_ONE_BASED - by default the divisor is the value read from the   * 	register plus one.  If CLK_DIVIDER_ONE_BASED is set then the divider is   * 	the raw value read from the register, with the value of zero considered - * 	invalid + *	invalid, unless CLK_DIVIDER_ALLOW_ZERO is set.   * CLK_DIVIDER_POWER_OF_TWO - clock divisor is 2 raised to the value read from   * 	the hardware register + * CLK_DIVIDER_ALLOW_ZERO - Allow zero divisors.  For dividers which have + *	CLK_DIVIDER_ONE_BASED set, it is possible to end up with a zero divisor. + *	Some hardware implementations gracefully handle this case and allow a + *	zero divisor by not modifying their input clock + *	(divide by one / bypass).   */  struct clk_divider {  	struct clk_hw	hw; @@ -255,6 +270,7 @@ struct clk_divider {  #define CLK_DIVIDER_ONE_BASED		BIT(0)  #define CLK_DIVIDER_POWER_OF_TWO	BIT(1) +#define CLK_DIVIDER_ALLOW_ZERO		BIT(2)  extern const struct clk_ops clk_divider_ops;  struct clk *clk_register_divider(struct device *dev, const char *name, @@ -274,7 +290,7 @@ struct clk *clk_register_divider_table(struct device *dev, const char *name,   * @reg:	register controlling multiplexer   * @shift:	shift to multiplexer bit field   * @width:	width of mutliplexer bit field - * @num_clks:	number of parent clocks + * @flags:	hardware-specific flags   * @lock:	register lock   *   * Clock with multiple selectable parents.  Implements .get_parent, .set_parent @@ -287,8 +303,9 @@ struct clk *clk_register_divider_table(struct device *dev, const char *name,  struct clk_mux {  	struct clk_hw	hw;  	void __iomem	*reg; +	u32		*table; +	u32		mask;  	u8		shift; -	u8		width;  	u8		flags;  	spinlock_t	*lock;  }; @@ -297,11 +314,17 @@ struct clk_mux {  #define CLK_MUX_INDEX_BIT		BIT(1)  extern const struct clk_ops clk_mux_ops; +  struct clk *clk_register_mux(struct device *dev, const char *name,  		const char **parent_names, u8 num_parents, unsigned long flags,  		void __iomem *reg, u8 shift, u8 width,  		u8 clk_mux_flags, spinlock_t *lock); +struct clk *clk_register_mux_table(struct device *dev, const char *name, +		const char **parent_names, u8 num_parents, unsigned long flags, +		void __iomem *reg, u8 shift, u32 mask, +		u8 clk_mux_flags, u32 *table, spinlock_t *lock); +  /**   * struct clk_fixed_factor - fixed multiplier and divider clock   * @@ -325,6 +348,37 @@ struct clk *clk_register_fixed_factor(struct device *dev, const char *name,  		const char *parent_name, unsigned long flags,  		unsigned int mult, unsigned int div); +/*** + * struct clk_composite - aggregate clock of mux, divider and gate clocks + * + * @hw:		handle between common and hardware-specific interfaces + * @mux_hw:	handle between composite and hardware-specifix mux clock + * @div_hw:	handle between composite and hardware-specifix divider clock + * @gate_hw:	handle between composite and hardware-specifix gate clock + * @mux_ops:	clock ops for mux + * @div_ops:	clock ops for divider + * @gate_ops:	clock ops for gate + */ +struct clk_composite { +	struct clk_hw	hw; +	struct clk_ops	ops; + +	struct clk_hw	*mux_hw; +	struct clk_hw	*div_hw; +	struct clk_hw	*gate_hw; + +	const struct clk_ops	*mux_ops; +	const struct clk_ops	*div_ops; +	const struct clk_ops	*gate_ops; +}; + +struct clk *clk_register_composite(struct device *dev, const char *name, +		const char **parent_names, int num_parents, +		struct clk_hw *mux_hw, const struct clk_ops *mux_ops, +		struct clk_hw *div_hw, const struct clk_ops *div_ops, +		struct clk_hw *gate_hw, const struct clk_ops *gate_ops, +		unsigned long flags); +  /**   * clk_register - allocate a new clock, register it and return an opaque cookie   * @dev: device that is registering this clock @@ -351,6 +405,7 @@ unsigned int __clk_get_enable_count(struct clk *clk);  unsigned int __clk_get_prepare_count(struct clk *clk);  unsigned long __clk_get_rate(struct clk *clk);  unsigned long __clk_get_flags(struct clk *clk); +bool __clk_is_prepared(struct clk *clk);  bool __clk_is_enabled(struct clk *clk);  struct clk *__clk_lookup(const char *name); |