mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
synced 2026-04-25 00:52:45 -04:00
clk: Inform the core about consumer devices
We'd like to have a pointer to the device that's consuming a particular clk in the clk framework so we can link the consumer to the clk provider with a PM device link. Add a device argument to clk_hw_create_clk() for this so it can be used in subsequent patches to add and remove the link. Cc: Miquel Raynal <miquel.raynal@bootlin.com> Cc: Jerome Brunet <jbrunet@baylibre.com> Cc: Russell King <linux@armlinux.org.uk> Cc: Michael Turquette <mturquette@baylibre.com> Cc: Jeffrey Hugo <jhugo@codeaurora.org> Cc: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Stephen Boyd <sboyd@kernel.org>
This commit is contained in:
@@ -51,7 +51,7 @@ static struct clk *__of_clk_get(struct device_node *np,
|
||||
{
|
||||
struct clk_hw *hw = of_clk_get_hw(np, index, con_id);
|
||||
|
||||
return clk_hw_create_clk(hw, dev_id, con_id);
|
||||
return clk_hw_create_clk(NULL, hw, dev_id, con_id);
|
||||
}
|
||||
|
||||
struct clk *of_clk_get(struct device_node *np, int index)
|
||||
@@ -130,7 +130,8 @@ static struct clk_lookup *clk_find(const char *dev_id, const char *con_id)
|
||||
return cl;
|
||||
}
|
||||
|
||||
struct clk *clk_get_sys(const char *dev_id, const char *con_id)
|
||||
static struct clk *__clk_get_sys(struct device *dev, const char *dev_id,
|
||||
const char *con_id)
|
||||
{
|
||||
struct clk_lookup *cl;
|
||||
struct clk *clk = NULL;
|
||||
@@ -141,7 +142,7 @@ struct clk *clk_get_sys(const char *dev_id, const char *con_id)
|
||||
if (!cl)
|
||||
goto out;
|
||||
|
||||
clk = clk_hw_create_clk(cl->clk_hw, dev_id, con_id);
|
||||
clk = clk_hw_create_clk(dev, cl->clk_hw, dev_id, con_id);
|
||||
if (IS_ERR(clk))
|
||||
cl = NULL;
|
||||
out:
|
||||
@@ -149,6 +150,11 @@ out:
|
||||
|
||||
return cl ? clk : ERR_PTR(-ENOENT);
|
||||
}
|
||||
|
||||
struct clk *clk_get_sys(const char *dev_id, const char *con_id)
|
||||
{
|
||||
return __clk_get_sys(NULL, dev_id, con_id);
|
||||
}
|
||||
EXPORT_SYMBOL(clk_get_sys);
|
||||
|
||||
struct clk *clk_get(struct device *dev, const char *con_id)
|
||||
@@ -159,10 +165,10 @@ struct clk *clk_get(struct device *dev, const char *con_id)
|
||||
if (dev && dev->of_node) {
|
||||
hw = of_clk_get_hw(dev->of_node, 0, con_id);
|
||||
if (!IS_ERR(hw) || PTR_ERR(hw) == -EPROBE_DEFER)
|
||||
return clk_hw_create_clk(hw, dev_id, con_id);
|
||||
return clk_hw_create_clk(dev, hw, dev_id, con_id);
|
||||
}
|
||||
|
||||
return clk_get_sys(dev_id, con_id);
|
||||
return __clk_get_sys(dev, dev_id, con_id);
|
||||
}
|
||||
EXPORT_SYMBOL(clk_get);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user