[PATCH 4/8] reset: amlogic: use reset number instead of register count

Jerome Brunet
2024-07-10T16:25:41Z

The reset driver from audio clock controller may register less
reset than a register can hold. To avoid making any change while
switching to auxiliary support, use the number of reset instead of the
register count to define the bounds of the reset controller.

Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
---
drivers/reset/reset-meson.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/drivers/reset/reset-meson.c b/drivers/reset/reset-meson.c
index fec55321b52b..3e0447366ba6 100644
--- a/drivers/reset/reset-meson.c
+++ b/drivers/reset/reset-meson.c
@@ -17,7 +17,7 @@
#include <linux/types.h>

struct meson_reset_param {
- int reg_count;
+ unsigned int reset_num;
int reset_offset;
int level_offset;
bool level_low_reset;
@@ -90,7 +90,6 @@ static const struct reset_control_ops meson_reset_ops = {
static int meson_reset_probe(struct device *dev, struct regmap *map,
const struct meson_reset_param *param)
{
- unsigned int stride = regmap_get_reg_stride(map);
struct meson_reset *data;

data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
@@ -100,8 +99,7 @@ static int meson_reset_probe(struct device *dev, struct regmap *map,
data->param = param;
data->map = map;
data->rcdev.owner = dev->driver->owner;
- data->rcdev.nr_resets = param->reg_count * BITS_PER_BYTE
- * stride;
+ data->rcdev.nr_resets = param->reset_num;
data->rcdev.ops = &meson_reset_ops;
data->rcdev.of_node = dev->of_node;

@@ -109,21 +107,21 @@ static int meson_reset_probe(struct device *dev, struct regmap *map,
}

static const struct meson_reset_param meson8b_param = {
- .reg_count = 8,
+ .reset_num = 256,
.reset_offset = 0x0,
.level_offset = 0x7c,
.level_low_reset = true,
};

static const struct meson_reset_param meson_a1_param = {
- .reg_count = 3,
+ .reset_num = 96,
.reset_offset = 0x0,
.level_offset = 0x40,
.level_low_reset = true,
};

static const struct meson_reset_param meson_s4_param = {
- .reg_count = 6,
+ .reset_num = 192,
.reset_offset = 0x0,
.level_offset = 0x40,
.level_low_reset = true,
--
2.43.0