niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

clk: rockchip: add lookup table support

Browse source 
Add support for mapping reset IDs to register offsets
to support gapless continous platform reset IDs.

Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Link: https://lore.kernel.org/r/20221018151407.63395-9-sebastian.reichel@collabora.com
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
This commit is contained in:
Sebastian Reichel 2022-10-18 17:14:06 +02:00 • committed by Heiko Stuebner
parent ff94c8660d
commit ada8f95ba0
2 changed files with 40 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
drivers/clk/rockchip/clk.h
View file

@ -958,15 +958,24 @@ struct clk *rockchip_clk_register_halfdiv(const char *name,
spinlock_t *lock); spinlock_t *lock);
#ifdef CONFIG_RESET_CONTROLLER #ifdef CONFIG_RESET_CONTROLLER
void rockchip_register_softrst(struct device_node *np, void rockchip_register_softrst_lut(struct device_node *np,
unsigned int num_regs, const int *lookup_table,
void __iomem *base, u8 flags); unsigned int num_regs,
void __iomem *base, u8 flags);
#else #else
static inline void rockchip_register_softrst(struct device_node *np, static inline void rockchip_register_softrst_lut(struct device_node *np,
unsigned int num_regs, const int *lookup_table,
void __iomem *base, u8 flags) unsigned int num_regs,
void __iomem *base, u8 flags)
{ {
} }
#endif #endif
static inline void rockchip_register_softrst(struct device_node *np,
unsigned int num_regs,
void __iomem *base, u8 flags)
{
return rockchip_register_softrst_lut(np, NULL, num_regs, base, flags);
}
#endif #endif

34
drivers/clk/rockchip/softrst.c
View file

@ -12,6 +12,7 @@
struct rockchip_softrst { struct rockchip_softrst {
struct reset_controller_dev rcdev; struct reset_controller_dev rcdev;
const int *lut;
void __iomem *reg_base; void __iomem *reg_base;
int num_regs; int num_regs;
int num_per_reg; int num_per_reg;
@ -25,8 +26,13 @@ static int rockchip_softrst_assert(struct reset_controller_dev *rcdev,
struct rockchip_softrst *softrst = container_of(rcdev, struct rockchip_softrst *softrst = container_of(rcdev,
struct rockchip_softrst, struct rockchip_softrst,
rcdev); rcdev);
int bank = id / softrst->num_per_reg; int bank, offset;
int offset = id % softrst->num_per_reg;
if (softrst->lut)
id = softrst->lut[id];
bank = id / softrst->num_per_reg;
offset = id % softrst->num_per_reg;
if (softrst->flags & ROCKCHIP_SOFTRST_HIWORD_MASK) { if (softrst->flags & ROCKCHIP_SOFTRST_HIWORD_MASK) {
writel(BIT(offset) | (BIT(offset) << 16), writel(BIT(offset) | (BIT(offset) << 16),
@ -52,8 +58,13 @@ static int rockchip_softrst_deassert(struct reset_controller_dev *rcdev,
struct rockchip_softrst *softrst = container_of(rcdev, struct rockchip_softrst *softrst = container_of(rcdev,
struct rockchip_softrst, struct rockchip_softrst,
rcdev); rcdev);
int bank = id / softrst->num_per_reg; int bank, offset;
int offset = id % softrst->num_per_reg;
if (softrst->lut)
id = softrst->lut[id];
bank = id / softrst->num_per_reg;
offset = id % softrst->num_per_reg;
if (softrst->flags & ROCKCHIP_SOFTRST_HIWORD_MASK) { if (softrst->flags & ROCKCHIP_SOFTRST_HIWORD_MASK) {
writel((BIT(offset) << 16), softrst->reg_base + (bank * 4)); writel((BIT(offset) << 16), softrst->reg_base + (bank * 4));
@ -77,9 +88,10 @@ static const struct reset_control_ops rockchip_softrst_ops = {
.deassert = rockchip_softrst_deassert, .deassert = rockchip_softrst_deassert,
}; };
void rockchip_register_softrst(struct device_node *np, void rockchip_register_softrst_lut(struct device_node *np,
unsigned int num_regs, const int *lookup_table,
void __iomem *base, u8 flags) unsigned int num_regs,
void __iomem *base, u8 flags)
{ {
struct rockchip_softrst *softrst; struct rockchip_softrst *softrst;
int ret; int ret;
@ -91,13 +103,17 @@ void rockchip_register_softrst(struct device_node *np,
spin_lock_init(&softrst->lock); spin_lock_init(&softrst->lock);
softrst->reg_base = base; softrst->reg_base = base;
softrst->lut = lookup_table;
softrst->flags = flags; softrst->flags = flags;
softrst->num_regs = num_regs; softrst->num_regs = num_regs;
softrst->num_per_reg = (flags & ROCKCHIP_SOFTRST_HIWORD_MASK) ? 16 softrst->num_per_reg = (flags & ROCKCHIP_SOFTRST_HIWORD_MASK) ? 16
: 32; : 32;
softrst->rcdev.owner = THIS_MODULE; softrst->rcdev.owner = THIS_MODULE;
softrst->rcdev.nr_resets = num_regs * softrst->num_per_reg; if (lookup_table)
softrst->rcdev.nr_resets = num_regs;
else
softrst->rcdev.nr_resets = num_regs * softrst->num_per_reg;
softrst->rcdev.ops = &rockchip_softrst_ops; softrst->rcdev.ops = &rockchip_softrst_ops;
softrst->rcdev.of_node = np; softrst->rcdev.of_node = np;
ret = reset_controller_register(&softrst->rcdev); ret = reset_controller_register(&softrst->rcdev);
@ -107,4 +123,4 @@ void rockchip_register_softrst(struct device_node *np,
kfree(softrst); kfree(softrst);
} }
}; };
EXPORT_SYMBOL_GPL(rockchip_register_softrst); EXPORT_SYMBOL_GPL(rockchip_register_softrst_lut);