Commit e270d8cb authored by Stephen Boyd's avatar Stephen Boyd

clk: gate: Add hw based registration APIs

Add registration APIs in the clk gate 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 eb7d264f
...@@ -110,7 +110,7 @@ const struct clk_ops clk_gate_ops = { ...@@ -110,7 +110,7 @@ const struct clk_ops clk_gate_ops = {
EXPORT_SYMBOL_GPL(clk_gate_ops); EXPORT_SYMBOL_GPL(clk_gate_ops);
/** /**
* clk_register_gate - register a gate clock with the clock framework * clk_hw_register_gate - register a gate clock with the clock framework
* @dev: device that is registering this clock * @dev: device that is registering this clock
* @name: name of this clock * @name: name of this clock
* @parent_name: name of this clock's parent * @parent_name: name of this clock's parent
...@@ -120,14 +120,15 @@ EXPORT_SYMBOL_GPL(clk_gate_ops); ...@@ -120,14 +120,15 @@ EXPORT_SYMBOL_GPL(clk_gate_ops);
* @clk_gate_flags: gate-specific flags for this clock * @clk_gate_flags: gate-specific flags for this clock
* @lock: shared register lock for this clock * @lock: shared register lock for this clock
*/ */
struct clk *clk_register_gate(struct device *dev, const char *name, struct clk_hw *clk_hw_register_gate(struct device *dev, const char *name,
const char *parent_name, unsigned long flags, const char *parent_name, unsigned long flags,
void __iomem *reg, u8 bit_idx, void __iomem *reg, u8 bit_idx,
u8 clk_gate_flags, spinlock_t *lock) u8 clk_gate_flags, spinlock_t *lock)
{ {
struct clk_gate *gate; struct clk_gate *gate;
struct clk *clk; struct clk_hw *hw;
struct clk_init_data init; struct clk_init_data init;
int ret;
if (clk_gate_flags & CLK_GATE_HIWORD_MASK) { if (clk_gate_flags & CLK_GATE_HIWORD_MASK) {
if (bit_idx > 15) { if (bit_idx > 15) {
...@@ -154,12 +155,29 @@ struct clk *clk_register_gate(struct device *dev, const char *name, ...@@ -154,12 +155,29 @@ struct clk *clk_register_gate(struct device *dev, const char *name,
gate->lock = lock; gate->lock = lock;
gate->hw.init = &init; gate->hw.init = &init;
clk = clk_register(dev, &gate->hw); hw = &gate->hw;
ret = clk_hw_register(dev, hw);
if (IS_ERR(clk)) if (ret) {
kfree(gate); kfree(gate);
hw = ERR_PTR(ret);
}
return clk; return hw;
}
EXPORT_SYMBOL_GPL(clk_hw_register_gate);
struct clk *clk_register_gate(struct device *dev, const char *name,
const char *parent_name, unsigned long flags,
void __iomem *reg, u8 bit_idx,
u8 clk_gate_flags, spinlock_t *lock)
{
struct clk_hw *hw;
hw = clk_hw_register_gate(dev, name, parent_name, flags, reg,
bit_idx, clk_gate_flags, lock);
if (IS_ERR(hw))
return ERR_CAST(hw);
return hw->clk;
} }
EXPORT_SYMBOL_GPL(clk_register_gate); EXPORT_SYMBOL_GPL(clk_register_gate);
...@@ -178,3 +196,14 @@ void clk_unregister_gate(struct clk *clk) ...@@ -178,3 +196,14 @@ void clk_unregister_gate(struct clk *clk)
kfree(gate); kfree(gate);
} }
EXPORT_SYMBOL_GPL(clk_unregister_gate); EXPORT_SYMBOL_GPL(clk_unregister_gate);
void clk_hw_unregister_gate(struct clk_hw *hw)
{
struct clk_gate *gate;
gate = to_clk_gate(hw);
clk_hw_unregister(hw);
kfree(gate);
}
EXPORT_SYMBOL_GPL(clk_hw_unregister_gate);
...@@ -326,7 +326,12 @@ struct clk *clk_register_gate(struct device *dev, const char *name, ...@@ -326,7 +326,12 @@ struct clk *clk_register_gate(struct device *dev, const char *name,
const char *parent_name, unsigned long flags, const char *parent_name, unsigned long flags,
void __iomem *reg, u8 bit_idx, void __iomem *reg, u8 bit_idx,
u8 clk_gate_flags, spinlock_t *lock); u8 clk_gate_flags, spinlock_t *lock);
struct clk_hw *clk_hw_register_gate(struct device *dev, const char *name,
const char *parent_name, unsigned long flags,
void __iomem *reg, u8 bit_idx,
u8 clk_gate_flags, spinlock_t *lock);
void clk_unregister_gate(struct clk *clk); void clk_unregister_gate(struct clk *clk);
void clk_hw_unregister_gate(struct clk_hw *hw);
struct clk_div_table { struct clk_div_table {
unsigned int val; unsigned int val;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment