Commit ada8f95b authored by Sebastian Reichel's avatar Sebastian Reichel Committed by Heiko Stuebner
Browse files

clk: rockchip: add lookup table support 



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

Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
Link: https://lore.kernel.org/r/20221018151407.63395-9-sebastian.reichel@collabora.com


Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
parent ff94c866

drivers/clk/rockchip/clk.h

+15 −6
Original line number Diff line number Diff line
@@ -958,15 +958,24 @@ struct clk *rockchip_clk_register_halfdiv(const char *name, 
					  spinlock_t *lock);



#ifdef CONFIG_RESET_CONTROLLER

void rockchip_register_softrst(struct device_node *np,

void rockchip_register_softrst_lut(struct device_node *np,

				   const int *lookup_table,

				   unsigned int num_regs,

				   void __iomem *base, u8 flags);

#else

static inline void rockchip_register_softrst(struct device_node *np,

static inline void rockchip_register_softrst_lut(struct device_node *np,

				   const int *lookup_table,

				   unsigned int num_regs,

				   void __iomem *base, u8 flags)

{

}

#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

drivers/clk/rockchip/softrst.c

+25 −9
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 


struct rockchip_softrst {

	struct reset_controller_dev	rcdev;

	const int			*lut;

	void __iomem			*reg_base;

	int				num_regs;

	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,

						     rcdev);

	int bank = id / softrst->num_per_reg;

	int offset = id % softrst->num_per_reg;

	int bank, offset;



	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) {

		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,

						     rcdev);

	int bank = id / softrst->num_per_reg;

	int offset = id % softrst->num_per_reg;

	int bank, offset;



	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) {

		writel((BIT(offset) << 16), softrst->reg_base + (bank * 4));
@@ -77,7 +88,8 @@ static const struct reset_control_ops rockchip_softrst_ops = { 
	.deassert	= rockchip_softrst_deassert,

};



void rockchip_register_softrst(struct device_node *np,

void rockchip_register_softrst_lut(struct device_node *np,

				   const int *lookup_table,

				   unsigned int num_regs,

				   void __iomem *base, u8 flags)

{
@@ -91,12 +103,16 @@ void rockchip_register_softrst(struct device_node *np, 
	spin_lock_init(&softrst->lock);



	softrst->reg_base = base;

	softrst->lut = lookup_table;

	softrst->flags = flags;

	softrst->num_regs = num_regs;

	softrst->num_per_reg = (flags & ROCKCHIP_SOFTRST_HIWORD_MASK) ? 16

								      : 32;



	softrst->rcdev.owner = THIS_MODULE;

	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.of_node = np;
@@ -107,4 +123,4 @@ void rockchip_register_softrst(struct device_node *np, 
		kfree(softrst);

	}

};

EXPORT_SYMBOL_GPL(rockchip_register_softrst);
 
EXPORT_SYMBOL_GPL(rockchip_register_softrst_lut);