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: 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>

diff --git a/drivers/clk/rockchip/clk.h b/drivers/clk/rockchip/clk.h
index 6e84ab85b372fd688b9341866095e76058b42ad5..7ee231d9585d54679d8a7ce3ac370ced2792693a 100644 (file)
--- a/drivers/clk/rockchip/clk.h
+++ b/drivers/clk/rockchip/clk.h
@@ -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,
-                              unsigned int num_regs,
-                              void __iomem *base, u8 flags);
+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,
-                              unsigned int num_regs,
-                              void __iomem *base, u8 flags)
+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

diff --git a/drivers/clk/rockchip/softrst.c b/drivers/clk/rockchip/softrst.c
index 5d07266745b890ec21c32c60ab0526bd393ae8a8..fd56aaefe6d14b25d0473c68d05ec991298d834d 100644 (file)
--- a/drivers/clk/rockchip/softrst.c
+++ b/drivers/clk/rockchip/softrst.c
@@ -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,9 +88,10 @@ static const struct reset_control_ops rockchip_softrst_ops = {
        .deassert       = rockchip_softrst_deassert,
 };
 
-void rockchip_register_softrst(struct device_node *np,
-                              unsigned int num_regs,
-                              void __iomem *base, u8 flags)
+void rockchip_register_softrst_lut(struct device_node *np,
+                                  const int *lookup_table,
+                                  unsigned int num_regs,
+                                  void __iomem *base, u8 flags)
 {
        struct rockchip_softrst *softrst;
        int ret;
@@ -91,13 +103,17 @@ 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;
-       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.of_node = np;
        ret = reset_controller_register(&softrst->rcdev);
@@ -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);