Skip to content

Commit ecffd05

Browse files
Nicolas Frattarolibebarino
authored andcommitted
clk: mediatek: Pass device to clk_hw_register for PLLs
Passing the struct device pointer to clk_hw_register allows for runtime power management to work for the registered clock controllers. However, the mediatek PLL clocks do not do this. Change this by adding a struct device pointer argument to mtk_clk_register_pll, and fix up the only other user of it. Also add a new member to the struct mtk_clk_pll for the struct device pointer, which is set by mtk_clk_register_pll and is used by mtk_clk_register_pll_ops. If mtk_clk_register_pll is called with a NULL struct device pointer, then everything still works as expected; the clock core will simply treat them as previously, i.e. without runtime power management. Reviewed-by: Chen-Yu Tsai <wenst@chromium.org> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Signed-off-by: Nicolas Frattaroli <nicolas.frattaroli@collabora.com> Signed-off-by: Stephen Boyd <sboyd@kernel.org>
1 parent c9ced38 commit ecffd05

3 files changed

Lines changed: 10 additions & 5 deletions

File tree

drivers/clk/mediatek/clk-pll.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -366,15 +366,16 @@ struct clk_hw *mtk_clk_register_pll_ops(struct mtk_clk_pll *pll,
366366
init.parent_names = &parent_name;
367367
init.num_parents = 1;
368368

369-
ret = clk_hw_register(NULL, &pll->hw);
369+
ret = clk_hw_register(pll->dev, &pll->hw);
370370

371371
if (ret)
372372
return ERR_PTR(ret);
373373

374374
return &pll->hw;
375375
}
376376

377-
struct clk_hw *mtk_clk_register_pll(const struct mtk_pll_data *data,
377+
struct clk_hw *mtk_clk_register_pll(struct device *dev,
378+
const struct mtk_pll_data *data,
378379
void __iomem *base)
379380
{
380381
struct mtk_clk_pll *pll;
@@ -385,6 +386,8 @@ struct clk_hw *mtk_clk_register_pll(const struct mtk_pll_data *data,
385386
if (!pll)
386387
return ERR_PTR(-ENOMEM);
387388

389+
pll->dev = dev;
390+
388391
hw = mtk_clk_register_pll_ops(pll, data, base, pll_ops);
389392
if (IS_ERR(hw))
390393
kfree(pll);
@@ -428,7 +431,7 @@ int mtk_clk_register_plls(struct device *dev,
428431
continue;
429432
}
430433

431-
hw = mtk_clk_register_pll(pll, base);
434+
hw = mtk_clk_register_pll(dev, pll, base);
432435

433436
if (IS_ERR(hw)) {
434437
pr_err("Failed to register clk %s: %pe\n", pll->name,

drivers/clk/mediatek/clk-pll.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ struct mtk_pll_data {
6161
*/
6262

6363
struct mtk_clk_pll {
64+
struct device *dev;
6465
struct clk_hw hw;
6566
void __iomem *base_addr;
6667
void __iomem *pd_addr;
@@ -108,7 +109,8 @@ struct clk_hw *mtk_clk_register_pll_ops(struct mtk_clk_pll *pll,
108109
const struct mtk_pll_data *data,
109110
void __iomem *base,
110111
const struct clk_ops *pll_ops);
111-
struct clk_hw *mtk_clk_register_pll(const struct mtk_pll_data *data,
112+
struct clk_hw *mtk_clk_register_pll(struct device *dev,
113+
const struct mtk_pll_data *data,
112114
void __iomem *base);
113115
void mtk_clk_unregister_pll(struct clk_hw *hw);
114116

drivers/clk/mediatek/clk-pllfh.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ int mtk_clk_register_pllfhs(struct device_node *node,
220220
if (use_fhctl)
221221
hw = mtk_clk_register_pllfh(pll, pllfh, base);
222222
else
223-
hw = mtk_clk_register_pll(pll, base);
223+
hw = mtk_clk_register_pll(NULL, pll, base);
224224

225225
if (IS_ERR(hw)) {
226226
pr_err("Failed to register %s clk %s: %ld\n",

0 commit comments

Comments
 (0)