Commit 55a8b3cd authored by Abel Vesa's avatar Abel Vesa Committed by Shawn Guo

clk: imx: pll14xx: Add the device as argument when registering

In order to allow runtime PM, the device needs to be passed on
to the register function. Audiomix clock controller, used on
i.MX8MP and future platforms, registers a pll14xx and has runtime
PM support.
Signed-off-by: default avatarAbel Vesa <abel.vesa@nxp.com>
Reviewed-by: default avatarStephen Boyd <sboyd@kernel.org>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 1e54afe9
...@@ -378,9 +378,9 @@ static const struct clk_ops clk_pll1443x_ops = { ...@@ -378,9 +378,9 @@ static const struct clk_ops clk_pll1443x_ops = {
.set_rate = clk_pll1443x_set_rate, .set_rate = clk_pll1443x_set_rate,
}; };
struct clk_hw *imx_clk_hw_pll14xx(const char *name, const char *parent_name, struct clk_hw *imx_dev_clk_hw_pll14xx(struct device *dev, const char *name,
void __iomem *base, const char *parent_name, void __iomem *base,
const struct imx_pll14xx_clk *pll_clk) const struct imx_pll14xx_clk *pll_clk)
{ {
struct clk_pll14xx *pll; struct clk_pll14xx *pll;
struct clk_hw *hw; struct clk_hw *hw;
...@@ -426,7 +426,7 @@ struct clk_hw *imx_clk_hw_pll14xx(const char *name, const char *parent_name, ...@@ -426,7 +426,7 @@ struct clk_hw *imx_clk_hw_pll14xx(const char *name, const char *parent_name,
hw = &pll->hw; hw = &pll->hw;
ret = clk_hw_register(NULL, hw); ret = clk_hw_register(dev, hw);
if (ret) { if (ret) {
pr_err("%s: failed to register pll %s %d\n", pr_err("%s: failed to register pll %s %d\n",
__func__, name, ret); __func__, name, ret);
......
...@@ -133,9 +133,9 @@ struct clk *imx_clk_pll14xx(const char *name, const char *parent_name, ...@@ -133,9 +133,9 @@ struct clk *imx_clk_pll14xx(const char *name, const char *parent_name,
#define imx_clk_pll14xx(name, parent_name, base, pll_clk) \ #define imx_clk_pll14xx(name, parent_name, base, pll_clk) \
to_clk(imx_clk_hw_pll14xx(name, parent_name, base, pll_clk)) to_clk(imx_clk_hw_pll14xx(name, parent_name, base, pll_clk))
struct clk_hw *imx_clk_hw_pll14xx(const char *name, const char *parent_name, struct clk_hw *imx_dev_clk_hw_pll14xx(struct device *dev, const char *name,
void __iomem *base, const char *parent_name, void __iomem *base,
const struct imx_pll14xx_clk *pll_clk); const struct imx_pll14xx_clk *pll_clk);
struct clk_hw *imx_clk_hw_pllv1(enum imx_pllv1_type type, const char *name, struct clk_hw *imx_clk_hw_pllv1(enum imx_pllv1_type type, const char *name,
const char *parent, void __iomem *base); const char *parent, void __iomem *base);
...@@ -242,6 +242,13 @@ static inline struct clk *to_clk(struct clk_hw *hw) ...@@ -242,6 +242,13 @@ static inline struct clk *to_clk(struct clk_hw *hw)
return hw->clk; return hw->clk;
} }
static inline struct clk_hw *imx_clk_hw_pll14xx(const char *name, const char *parent_name,
void __iomem *base,
const struct imx_pll14xx_clk *pll_clk)
{
return imx_dev_clk_hw_pll14xx(NULL, name, parent_name, base, pll_clk);
}
static inline struct clk_hw *imx_clk_hw_fixed(const char *name, int rate) static inline struct clk_hw *imx_clk_hw_fixed(const char *name, int rate)
{ {
return clk_hw_register_fixed_rate(NULL, name, NULL, 0, rate); return clk_hw_register_fixed_rate(NULL, name, NULL, 0, rate);
......
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