Commit 83dde3e5 authored by Jerome Brunet's avatar Jerome Brunet Committed by Philipp Zabel
Browse files

reset: amlogic: use reset number instead of register count 



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.

Reviewed-by: default avatarNeil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: default avatarJerome Brunet <jbrunet@baylibre.com>
Reviewed-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Link: https://lore.kernel.org/r/20240910-meson-rst-aux-v5-5-60be62635d3e@baylibre.com


Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
parent 6b2d2e5c

drivers/reset/reset-meson.c

+6 −7
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include <linux/types.h>



struct meson_reset_param {

	unsigned int reg_count;

	unsigned int reset_num;

	unsigned int reset_offset;

	unsigned int level_offset;

	bool level_low_reset;
@@ -87,28 +87,28 @@ static const struct reset_control_ops meson_reset_ops = { 
};



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,

};



static const struct meson_reset_param t7_param = {

	.reg_count      = 7,

	.reset_num      = 224,

	.reset_offset	= 0x0,

	.level_offset   = 0x40,

	.level_low_reset = true,
@@ -156,8 +156,7 @@ static int meson_reset_probe(struct platform_device *pdev) 
				     "can't init regmap mmio region\n");



	data->rcdev.owner = THIS_MODULE;

	data->rcdev.nr_resets = data->param->reg_count * BITS_PER_BYTE

		* regmap_config.reg_stride;

	data->rcdev.nr_resets = data->param->reset_num;

	data->rcdev.ops = &meson_reset_ops;

	data->rcdev.of_node = dev->of_node;