mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-09-04 20:19:47 +08:00
As part of the effort to improve the MediaTek clk drivers, the next step
is to switch from the old 'struct clk' clk prodivder APIs to the new
'struct clk_hw' ones.
In a previous patch, 'struct clk_onecell_data' was replaced with
'struct clk_hw_onecell_data', with (struct clk_hw *)->clk and
__clk_get_hw() bridging the new data structures and old code.
Now switch from the old 'clk_(un)?register*()' APIs to the new
'clk_hw_(un)?register*()' ones. This is done with the coccinelle script
below.
Unfortunately this also leaves clk-mt8173.c with a compile error that
would need a coccinelle script longer than the actual diff to fix. This
last part is fixed up by hand.
// Fix prototypes
@@
identifier F =~ "^mtk_clk_register_";
@@
- struct clk *
+ struct clk_hw *
F(...);
// Fix calls to mtk_clk_register_<singular>
@ reg @
identifier F =~ "^mtk_clk_register_";
identifier FS =~ "^mtk_clk_register_[a-z_]*s";
identifier I;
expression clk_data;
expression E;
@@
FS(...) {
...
- struct clk *I;
+ struct clk_hw *hw;
...
for (...;...;...) {
...
(
- I
+ hw
=
- clk_register_fixed_rate(
+ clk_hw_register_fixed_rate(
...
);
|
- I
+ hw
=
- clk_register_fixed_factor(
+ clk_hw_register_fixed_factor(
...
);
|
- I
+ hw
=
- clk_register_divider(
+ clk_hw_register_divider(
...
);
|
- I
+ hw
=
F(...);
)
...
if (
- IS_ERR(I)
+ IS_ERR(hw)
) {
pr_err(...,
- I
+ hw
,...);
...
}
- clk_data->hws[E] = __clk_get_hw(I);
+ clk_data->hws[E] = hw;
}
...
}
@ depends on reg @
identifier reg.I;
@@
return PTR_ERR(
- I
+ hw
);
// Fix mtk_clk_register_composite to return clk_hw instead of clk
@@
identifier I, R;
expression E;
@@
- struct clk *
+ struct clk_hw *
mtk_clk_register_composite(...) {
...
- struct clk *I;
+ struct clk_hw *hw;
...
- I = clk_register_composite(
+ hw = clk_hw_register_composite(
...);
if (IS_ERR(
- I
+ hw
)) {
...
R = PTR_ERR(
- I
+ hw
);
...
}
return
- I
+ hw
;
...
}
// Fix other mtk_clk_register_<singular> to return clk_hw instead of clk
@@
identifier F =~ "^mtk_clk_register_";
identifier I, D, C;
expression E;
@@
- struct clk *
+ struct clk_hw *
F(...) {
...
- struct clk *I;
+ int ret;
...
- I = clk_register(D, E);
+ ret = clk_hw_register(D, E);
...
(
- if (IS_ERR(I))
+ if (ret) {
kfree(C);
+ return ERR_PTR(ret);
+ }
|
- if (IS_ERR(I))
+ if (ret)
{
kfree(C);
- return I;
+ return ERR_PTR(ret);
}
)
- return I;
+ return E;
}
// Fix mtk_clk_unregister_<singular> to take clk_hw instead of clk
@@
identifier F =~ "^mtk_clk_unregister_";
identifier I, I2;
@@
static void F(
- struct clk *I
+ struct clk_hw *I2
)
{
...
- struct clk_hw *I2;
...
- I2 = __clk_get_hw(I);
...
(
- clk_unregister(I);
+ clk_hw_unregister(I2);
|
- clk_unregister_composite(I);
+ clk_hw_unregister_composite(I2);
)
...
}
// Fix calls to mtk_clk_unregister_*()
@@
identifier F =~ "^mtk_clk_unregister_";
expression I;
expression E;
@@
- F(I->hws[E]->clk);
+ F(I->hws[E]);
Signed-off-by: Chen-Yu Tsai <wenst@chromium.org>
Reviewed-by: Miles Chen <miles.chen@mediatek.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Tested-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Tested-by: Miles Chen <miles.chen@mediatek.com>
Link: https://lore.kernel.org/r/20220519071610.423372-5-wenst@chromium.org
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
171 lines
3.5 KiB
C
171 lines
3.5 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* Copyright (c) 2015 Linaro Ltd.
|
|
* Author: Pi-Cheng Chen <pi-cheng.chen@linaro.org>
|
|
*/
|
|
|
|
#include <linux/clk-provider.h>
|
|
#include <linux/container_of.h>
|
|
#include <linux/err.h>
|
|
#include <linux/mfd/syscon.h>
|
|
#include <linux/module.h>
|
|
#include <linux/regmap.h>
|
|
#include <linux/slab.h>
|
|
|
|
#include "clk-mtk.h"
|
|
#include "clk-cpumux.h"
|
|
|
|
struct mtk_clk_cpumux {
|
|
struct clk_hw hw;
|
|
struct regmap *regmap;
|
|
u32 reg;
|
|
u32 mask;
|
|
u8 shift;
|
|
};
|
|
|
|
static inline struct mtk_clk_cpumux *to_mtk_clk_cpumux(struct clk_hw *_hw)
|
|
{
|
|
return container_of(_hw, struct mtk_clk_cpumux, hw);
|
|
}
|
|
|
|
static u8 clk_cpumux_get_parent(struct clk_hw *hw)
|
|
{
|
|
struct mtk_clk_cpumux *mux = to_mtk_clk_cpumux(hw);
|
|
unsigned int val;
|
|
|
|
regmap_read(mux->regmap, mux->reg, &val);
|
|
|
|
val >>= mux->shift;
|
|
val &= mux->mask;
|
|
|
|
return val;
|
|
}
|
|
|
|
static int clk_cpumux_set_parent(struct clk_hw *hw, u8 index)
|
|
{
|
|
struct mtk_clk_cpumux *mux = to_mtk_clk_cpumux(hw);
|
|
u32 mask, val;
|
|
|
|
val = index << mux->shift;
|
|
mask = mux->mask << mux->shift;
|
|
|
|
return regmap_update_bits(mux->regmap, mux->reg, mask, val);
|
|
}
|
|
|
|
static const struct clk_ops clk_cpumux_ops = {
|
|
.get_parent = clk_cpumux_get_parent,
|
|
.set_parent = clk_cpumux_set_parent,
|
|
};
|
|
|
|
static struct clk_hw *
|
|
mtk_clk_register_cpumux(const struct mtk_composite *mux,
|
|
struct regmap *regmap)
|
|
{
|
|
struct mtk_clk_cpumux *cpumux;
|
|
int ret;
|
|
struct clk_init_data init;
|
|
|
|
cpumux = kzalloc(sizeof(*cpumux), GFP_KERNEL);
|
|
if (!cpumux)
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
init.name = mux->name;
|
|
init.ops = &clk_cpumux_ops;
|
|
init.parent_names = mux->parent_names;
|
|
init.num_parents = mux->num_parents;
|
|
init.flags = mux->flags;
|
|
|
|
cpumux->reg = mux->mux_reg;
|
|
cpumux->shift = mux->mux_shift;
|
|
cpumux->mask = BIT(mux->mux_width) - 1;
|
|
cpumux->regmap = regmap;
|
|
cpumux->hw.init = &init;
|
|
|
|
ret = clk_hw_register(NULL, &cpumux->hw);
|
|
if (ret) {
|
|
kfree(cpumux);
|
|
return ERR_PTR(ret);
|
|
}
|
|
|
|
return &cpumux->hw;
|
|
}
|
|
|
|
static void mtk_clk_unregister_cpumux(struct clk_hw *hw)
|
|
{
|
|
struct mtk_clk_cpumux *cpumux;
|
|
if (!hw)
|
|
return;
|
|
|
|
cpumux = to_mtk_clk_cpumux(hw);
|
|
|
|
clk_hw_unregister(hw);
|
|
kfree(cpumux);
|
|
}
|
|
|
|
int mtk_clk_register_cpumuxes(struct device_node *node,
|
|
const struct mtk_composite *clks, int num,
|
|
struct clk_hw_onecell_data *clk_data)
|
|
{
|
|
int i;
|
|
struct clk_hw *hw;
|
|
struct regmap *regmap;
|
|
|
|
regmap = device_node_to_regmap(node);
|
|
if (IS_ERR(regmap)) {
|
|
pr_err("Cannot find regmap for %pOF: %pe\n", node, regmap);
|
|
return PTR_ERR(regmap);
|
|
}
|
|
|
|
for (i = 0; i < num; i++) {
|
|
const struct mtk_composite *mux = &clks[i];
|
|
|
|
if (!IS_ERR_OR_NULL(clk_data->hws[mux->id])) {
|
|
pr_warn("%pOF: Trying to register duplicate clock ID: %d\n",
|
|
node, mux->id);
|
|
continue;
|
|
}
|
|
|
|
hw = mtk_clk_register_cpumux(mux, regmap);
|
|
if (IS_ERR(hw)) {
|
|
pr_err("Failed to register clk %s: %pe\n", mux->name,
|
|
hw);
|
|
goto err;
|
|
}
|
|
|
|
clk_data->hws[mux->id] = hw;
|
|
}
|
|
|
|
return 0;
|
|
|
|
err:
|
|
while (--i >= 0) {
|
|
const struct mtk_composite *mux = &clks[i];
|
|
|
|
if (IS_ERR_OR_NULL(clk_data->hws[mux->id]))
|
|
continue;
|
|
|
|
mtk_clk_unregister_cpumux(clk_data->hws[mux->id]);
|
|
clk_data->hws[mux->id] = ERR_PTR(-ENOENT);
|
|
}
|
|
|
|
return PTR_ERR(hw);
|
|
}
|
|
|
|
void mtk_clk_unregister_cpumuxes(const struct mtk_composite *clks, int num,
|
|
struct clk_hw_onecell_data *clk_data)
|
|
{
|
|
int i;
|
|
|
|
for (i = num; i > 0; i--) {
|
|
const struct mtk_composite *mux = &clks[i - 1];
|
|
|
|
if (IS_ERR_OR_NULL(clk_data->hws[mux->id]))
|
|
continue;
|
|
|
|
mtk_clk_unregister_cpumux(clk_data->hws[mux->id]);
|
|
clk_data->hws[mux->id] = ERR_PTR(-ENOENT);
|
|
}
|
|
}
|
|
|
|
MODULE_LICENSE("GPL");
|