Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 264b3171 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

clk: mux: Add hw based registration APIs 



Add registration APIs in the clk mux code to return struct clk_hw
pointers instead of struct clk pointers. This way we hide the
struct clk pointer from providers unless they need to use
consumer facing APIs.

Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
parent e270d8cb

drivers/clk/clk-mux.c

+51 −6
Original line number Diff line number Diff line
@@ -113,16 +113,17 @@ const struct clk_ops clk_mux_ro_ops = { 
};

EXPORT_SYMBOL_GPL(clk_mux_ro_ops);



struct clk *clk_register_mux_table(struct device *dev, const char *name,

struct clk_hw *clk_hw_register_mux_table(struct device *dev, const char *name,

		const char * const *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_mux *mux;

	struct clk *clk;

	struct clk_hw *hw;

	struct clk_init_data init;

	u8 width = 0;

	int ret;



	if (clk_mux_flags & CLK_MUX_HIWORD_MASK) {

		width = fls(mask) - ffs(mask) + 1;
@@ -157,12 +158,31 @@ struct clk *clk_register_mux_table(struct device *dev, const char *name, 
	mux->table = table;

	mux->hw.init = &init;



	clk = clk_register(dev, &mux->hw);



	if (IS_ERR(clk))

	hw = &mux->hw;

	ret = clk_hw_register(dev, hw);

	if (ret) {

		kfree(mux);

		hw = ERR_PTR(ret);

	}



	return clk;

	return hw;

}

EXPORT_SYMBOL_GPL(clk_hw_register_mux_table);



struct clk *clk_register_mux_table(struct device *dev, const char *name,

		const char * const *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_hw *hw;



	hw = clk_hw_register_mux_table(dev, name, parent_names, num_parents,

				       flags, reg, shift, mask, clk_mux_flags,

				       table, lock);

	if (IS_ERR(hw))

		return ERR_CAST(hw);

	return hw->clk;

}

EXPORT_SYMBOL_GPL(clk_register_mux_table);
@@ -180,6 +200,20 @@ struct clk *clk_register_mux(struct device *dev, const char *name, 
}

EXPORT_SYMBOL_GPL(clk_register_mux);



struct clk_hw *clk_hw_register_mux(struct device *dev, const char *name,

		const char * const *parent_names, u8 num_parents,

		unsigned long flags,

		void __iomem *reg, u8 shift, u8 width,

		u8 clk_mux_flags, spinlock_t *lock)

{

	u32 mask = BIT(width) - 1;



	return clk_hw_register_mux_table(dev, name, parent_names, num_parents,

				      flags, reg, shift, mask, clk_mux_flags,

				      NULL, lock);

}

EXPORT_SYMBOL_GPL(clk_hw_register_mux);



void clk_unregister_mux(struct clk *clk)

{

	struct clk_mux *mux;
@@ -195,3 +229,14 @@ void clk_unregister_mux(struct clk *clk) 
	kfree(mux);

}

EXPORT_SYMBOL_GPL(clk_unregister_mux);



void clk_hw_unregister_mux(struct clk_hw *hw)

{

	struct clk_mux *mux;



	mux = to_clk_mux(hw);



	clk_hw_unregister(hw);

	kfree(mux);

}

EXPORT_SYMBOL_GPL(clk_hw_unregister_mux);

include/linux/clk-provider.h

+11 −0
Original line number Diff line number Diff line
@@ -478,14 +478,25 @@ struct clk *clk_register_mux(struct device *dev, const char *name, 
		unsigned long flags,

		void __iomem *reg, u8 shift, u8 width,

		u8 clk_mux_flags, spinlock_t *lock);

struct clk_hw *clk_hw_register_mux(struct device *dev, const char *name,

		const char * const *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 * const *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_hw *clk_hw_register_mux_table(struct device *dev, const char *name,

		const char * const *parent_names, u8 num_parents,

		unsigned long flags,

		void __iomem *reg, u8 shift, u32 mask,

		u8 clk_mux_flags, u32 *table, spinlock_t *lock);



void clk_unregister_mux(struct clk *clk);

void clk_hw_unregister_mux(struct clk_hw *hw);



void of_fixed_factor_clk_setup(struct device_node *node);