mirror of
https://git.proxmox.com/git/mirror_ubuntu-kernels.git
synced 2025-11-23 14:21:35 +00: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>
205 lines
5.3 KiB
C
205 lines
5.3 KiB
C
/* SPDX-License-Identifier: GPL-2.0-only */
|
|
/*
|
|
* Copyright (c) 2014 MediaTek Inc.
|
|
* Author: James Liao <jamesjj.liao@mediatek.com>
|
|
*/
|
|
|
|
#ifndef __DRV_CLK_MTK_H
|
|
#define __DRV_CLK_MTK_H
|
|
|
|
#include <linux/clk-provider.h>
|
|
#include <linux/io.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/spinlock.h>
|
|
#include <linux/types.h>
|
|
|
|
#define MAX_MUX_GATE_BIT 31
|
|
#define INVALID_MUX_GATE_BIT (MAX_MUX_GATE_BIT + 1)
|
|
|
|
#define MHZ (1000 * 1000)
|
|
|
|
struct platform_device;
|
|
|
|
struct mtk_fixed_clk {
|
|
int id;
|
|
const char *name;
|
|
const char *parent;
|
|
unsigned long rate;
|
|
};
|
|
|
|
#define FIXED_CLK(_id, _name, _parent, _rate) { \
|
|
.id = _id, \
|
|
.name = _name, \
|
|
.parent = _parent, \
|
|
.rate = _rate, \
|
|
}
|
|
|
|
int mtk_clk_register_fixed_clks(const struct mtk_fixed_clk *clks, int num,
|
|
struct clk_hw_onecell_data *clk_data);
|
|
void mtk_clk_unregister_fixed_clks(const struct mtk_fixed_clk *clks, int num,
|
|
struct clk_hw_onecell_data *clk_data);
|
|
|
|
struct mtk_fixed_factor {
|
|
int id;
|
|
const char *name;
|
|
const char *parent_name;
|
|
int mult;
|
|
int div;
|
|
};
|
|
|
|
#define FACTOR(_id, _name, _parent, _mult, _div) { \
|
|
.id = _id, \
|
|
.name = _name, \
|
|
.parent_name = _parent, \
|
|
.mult = _mult, \
|
|
.div = _div, \
|
|
}
|
|
|
|
int mtk_clk_register_factors(const struct mtk_fixed_factor *clks, int num,
|
|
struct clk_hw_onecell_data *clk_data);
|
|
void mtk_clk_unregister_factors(const struct mtk_fixed_factor *clks, int num,
|
|
struct clk_hw_onecell_data *clk_data);
|
|
|
|
struct mtk_composite {
|
|
int id;
|
|
const char *name;
|
|
const char * const *parent_names;
|
|
const char *parent;
|
|
unsigned flags;
|
|
|
|
uint32_t mux_reg;
|
|
uint32_t divider_reg;
|
|
uint32_t gate_reg;
|
|
|
|
signed char mux_shift;
|
|
signed char mux_width;
|
|
signed char gate_shift;
|
|
|
|
signed char divider_shift;
|
|
signed char divider_width;
|
|
|
|
u8 mux_flags;
|
|
|
|
signed char num_parents;
|
|
};
|
|
|
|
#define MUX_GATE_FLAGS_2(_id, _name, _parents, _reg, _shift, \
|
|
_width, _gate, _flags, _muxflags) { \
|
|
.id = _id, \
|
|
.name = _name, \
|
|
.mux_reg = _reg, \
|
|
.mux_shift = _shift, \
|
|
.mux_width = _width, \
|
|
.gate_reg = _reg, \
|
|
.gate_shift = _gate, \
|
|
.divider_shift = -1, \
|
|
.parent_names = _parents, \
|
|
.num_parents = ARRAY_SIZE(_parents), \
|
|
.flags = _flags, \
|
|
.mux_flags = _muxflags, \
|
|
}
|
|
|
|
/*
|
|
* In case the rate change propagation to parent clocks is undesirable,
|
|
* this macro allows to specify the clock flags manually.
|
|
*/
|
|
#define MUX_GATE_FLAGS(_id, _name, _parents, _reg, _shift, _width, \
|
|
_gate, _flags) \
|
|
MUX_GATE_FLAGS_2(_id, _name, _parents, _reg, \
|
|
_shift, _width, _gate, _flags, 0)
|
|
|
|
/*
|
|
* Unless necessary, all MUX_GATE clocks propagate rate changes to their
|
|
* parent clock by default.
|
|
*/
|
|
#define MUX_GATE(_id, _name, _parents, _reg, _shift, _width, _gate) \
|
|
MUX_GATE_FLAGS(_id, _name, _parents, _reg, _shift, _width, \
|
|
_gate, CLK_SET_RATE_PARENT)
|
|
|
|
#define MUX(_id, _name, _parents, _reg, _shift, _width) \
|
|
MUX_FLAGS(_id, _name, _parents, _reg, \
|
|
_shift, _width, CLK_SET_RATE_PARENT)
|
|
|
|
#define MUX_FLAGS(_id, _name, _parents, _reg, _shift, _width, _flags) { \
|
|
.id = _id, \
|
|
.name = _name, \
|
|
.mux_reg = _reg, \
|
|
.mux_shift = _shift, \
|
|
.mux_width = _width, \
|
|
.gate_shift = -1, \
|
|
.divider_shift = -1, \
|
|
.parent_names = _parents, \
|
|
.num_parents = ARRAY_SIZE(_parents), \
|
|
.flags = _flags, \
|
|
}
|
|
|
|
#define DIV_GATE(_id, _name, _parent, _gate_reg, _gate_shift, _div_reg, \
|
|
_div_width, _div_shift) { \
|
|
.id = _id, \
|
|
.parent = _parent, \
|
|
.name = _name, \
|
|
.divider_reg = _div_reg, \
|
|
.divider_shift = _div_shift, \
|
|
.divider_width = _div_width, \
|
|
.gate_reg = _gate_reg, \
|
|
.gate_shift = _gate_shift, \
|
|
.mux_shift = -1, \
|
|
.flags = 0, \
|
|
}
|
|
|
|
int mtk_clk_register_composites(const struct mtk_composite *mcs, int num,
|
|
void __iomem *base, spinlock_t *lock,
|
|
struct clk_hw_onecell_data *clk_data);
|
|
void mtk_clk_unregister_composites(const struct mtk_composite *mcs, int num,
|
|
struct clk_hw_onecell_data *clk_data);
|
|
|
|
struct mtk_clk_divider {
|
|
int id;
|
|
const char *name;
|
|
const char *parent_name;
|
|
unsigned long flags;
|
|
|
|
u32 div_reg;
|
|
unsigned char div_shift;
|
|
unsigned char div_width;
|
|
unsigned char clk_divider_flags;
|
|
const struct clk_div_table *clk_div_table;
|
|
};
|
|
|
|
#define DIV_ADJ(_id, _name, _parent, _reg, _shift, _width) { \
|
|
.id = _id, \
|
|
.name = _name, \
|
|
.parent_name = _parent, \
|
|
.div_reg = _reg, \
|
|
.div_shift = _shift, \
|
|
.div_width = _width, \
|
|
}
|
|
|
|
int mtk_clk_register_dividers(const struct mtk_clk_divider *mcds, int num,
|
|
void __iomem *base, spinlock_t *lock,
|
|
struct clk_hw_onecell_data *clk_data);
|
|
void mtk_clk_unregister_dividers(const struct mtk_clk_divider *mcds, int num,
|
|
struct clk_hw_onecell_data *clk_data);
|
|
|
|
struct clk_hw_onecell_data *mtk_alloc_clk_data(unsigned int clk_num);
|
|
void mtk_free_clk_data(struct clk_hw_onecell_data *clk_data);
|
|
|
|
struct clk_hw *mtk_clk_register_ref2usb_tx(const char *name,
|
|
const char *parent_name, void __iomem *reg);
|
|
|
|
void mtk_register_reset_controller(struct device_node *np,
|
|
unsigned int num_regs, int regofs);
|
|
|
|
void mtk_register_reset_controller_set_clr(struct device_node *np,
|
|
unsigned int num_regs, int regofs);
|
|
|
|
struct mtk_clk_desc {
|
|
const struct mtk_gate *clks;
|
|
size_t num_clks;
|
|
};
|
|
|
|
int mtk_clk_simple_probe(struct platform_device *pdev);
|
|
int mtk_clk_simple_remove(struct platform_device *pdev);
|
|
|
|
#endif /* __DRV_CLK_MTK_H */
|