Commit 93c873d6 authored by Martin Blumenstingl's avatar Martin Blumenstingl Committed by Jerome Brunet
Browse files

clk: meson: meson8b: use the regmap in the internal reset controller 



For now the reset controller was using raw register access because the
early init did not initialize the regmap. However, now that clocks are
initialized early we can simply use the regmap also for the reset
controller.
No functional changes.

Signed-off-by: default avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: default avatarJerome Brunet <jbrunet@baylibre.com>
parent 6291b8c5

drivers/clk/meson/meson8b.c

+6 −7
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ static DEFINE_SPINLOCK(meson_clk_lock); 


struct meson8b_clk_reset {

	struct reset_controller_dev reset;

	void __iomem *base;

	struct regmap *regmap;

};



static const struct pll_params_table sys_pll_params_table[] = {
@@ -1064,7 +1064,6 @@ static int meson8b_clk_reset_update(struct reset_controller_dev *rcdev, 
		container_of(rcdev, struct meson8b_clk_reset, reset);

	unsigned long flags;

	const struct meson8b_clk_reset_line *reset;

	u32 val;



	if (id >= ARRAY_SIZE(meson8b_clk_reset_bits))

		return -EINVAL;
@@ -1073,12 +1072,12 @@ static int meson8b_clk_reset_update(struct reset_controller_dev *rcdev, 


	spin_lock_irqsave(&meson_clk_lock, flags);



	val = readl(meson8b_clk_reset->base + reset->reg);

	if (assert)

		val |= BIT(reset->bit_idx);

		regmap_update_bits(meson8b_clk_reset->regmap, reset->reg,

				   BIT(reset->bit_idx), BIT(reset->bit_idx));

	else

		val &= ~BIT(reset->bit_idx);

	writel(val, meson8b_clk_reset->base + reset->reg);

		regmap_update_bits(meson8b_clk_reset->regmap, reset->reg,

				   BIT(reset->bit_idx), 0);



	spin_unlock_irqrestore(&meson_clk_lock, flags);
@@ -1131,7 +1130,7 @@ static void __init meson8b_clkc_init(struct device_node *np) 
		return;



	/* Reset Controller */

	rstc->base = clk_base;

	rstc->regmap = map;

	rstc->reset.ops = &meson8b_clk_reset_ops;

	rstc->reset.nr_resets = ARRAY_SIZE(meson8b_clk_reset_bits);

	rstc->reset.of_node = np;

CRA Git | Maintained and supported by SUSTech CRA and CCSE