On Fri, Oct 04, 2013 at 12:08:30PM +0200, Sebastian Hesselbarth wrote: > To determine if a clk has been previously enabled, provide a public > clk_is_enabled function. This is especially helpful to check the state > of clk-gate without actually changing the state of the gate. > > Signed-off-by: Sebastian Hesselbarth <[email protected]>
Tested-by: Andrew Lunn <[email protected]> Andrew > --- > Cc: Mike Turquette <[email protected]> > Cc: Russell King <[email protected]> > Cc: Jason Cooper <[email protected]> > Cc: Andrew Lunn <[email protected]> > Cc: Grant Likely <[email protected]> > Cc: Benjamin Herrenschmidt <[email protected]> > Cc: Jason Gunthorpe <[email protected]> > Cc: Ezequiel Garcia <[email protected]> > Cc: [email protected] > Cc: [email protected] > --- > drivers/clk/clk.c | 18 ++++++++++++++++++ > include/linux/clk.h | 13 +++++++++++++ > 2 files changed, 31 insertions(+) > > diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c > index a004769..26698d3 100644 > --- a/drivers/clk/clk.c > +++ b/drivers/clk/clk.c > @@ -929,6 +929,24 @@ int clk_enable(struct clk *clk) > EXPORT_SYMBOL_GPL(clk_enable); > > /** > + * clk_is_enabled - return the enabled state of a clk > + * @clk: the clk whose enabled state gets returned > + * > + * Returns true if the clock is enabled, false otherwise. > + */ > +bool clk_is_enabled(struct clk *clk) > +{ > + bool is_en; > + > + clk_prepare_lock(); > + is_en = __clk_is_enabled(clk); > + clk_prepare_unlock(); > + > + return is_en; > +} > +EXPORT_SYMBOL_GPL(clk_is_enabled); > + > +/** > * __clk_round_rate - round the given rate for a clk > * @clk: round the rate of this clock > * @rate: the rate which is to be rounded > diff --git a/include/linux/clk.h b/include/linux/clk.h > index 9a6d045..8cbf2f7 100644 > --- a/include/linux/clk.h > +++ b/include/linux/clk.h > @@ -187,6 +187,14 @@ int clk_enable(struct clk *clk); > void clk_disable(struct clk *clk); > > /** > + * clk_is_enabled - return the enabled state of a clk > + * @clk: the clk whose enabled state gets returned > + * > + * Returns true if the clock is enabled, false otherwise. > + */ > +bool clk_is_enabled(struct clk *clk); > + > +/** > * clk_get_rate - obtain the current clock rate (in Hz) for a clock source. > * This is only valid once the clock source has been enabled. > * @clk: clock source > @@ -299,6 +307,11 @@ static inline int clk_enable(struct clk *clk) > > static inline void clk_disable(struct clk *clk) {} > > +static inline bool clk_is_enabled(struct clk *clk) > +{ > + return false; > +} > + > static inline unsigned long clk_get_rate(struct clk *clk) > { > return 0; > -- > 1.7.10.4 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
