Commit 704d9183 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Uwe Kleine-König
Browse files

pwm: mediatek: Handle hardware enable and clock enable separately 



Stop handling the clocks in pwm_mediatek_enable() and
pwm_mediatek_disable(). This is a preparing change for the next commit
that requires that clocks and the enable bit are handled separately.

Also move these two functions a bit further up in the source file to
make them usable in pwm_mediatek_config(), which is needed in the next
commit, too.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@baylibre.com>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://lore.kernel.org/r/55c94fe2917ece152ee1e998f4675642a7716f13.1753717973.git.u.kleine-koenig@baylibre.com


Cc: stable@vger.kernel.org
Signed-off-by: default avatarUwe Kleine-König <ukleinek@kernel.org>
parent 68b9272c

drivers/pwm/pwm-mediatek.c

+28 −32
Original line number Diff line number Diff line
@@ -121,6 +121,26 @@ static inline void pwm_mediatek_writel(struct pwm_mediatek_chip *chip, 
	writel(value, chip->regs + chip->soc->reg_offset[num] + offset);

}



static void pwm_mediatek_enable(struct pwm_chip *chip, struct pwm_device *pwm)

{

	struct pwm_mediatek_chip *pc = to_pwm_mediatek_chip(chip);

	u32 value;



	value = readl(pc->regs);

	value |= BIT(pwm->hwpwm);

	writel(value, pc->regs);

}



static void pwm_mediatek_disable(struct pwm_chip *chip, struct pwm_device *pwm)

{

	struct pwm_mediatek_chip *pc = to_pwm_mediatek_chip(chip);

	u32 value;



	value = readl(pc->regs);

	value &= ~BIT(pwm->hwpwm);

	writel(value, pc->regs);

}



static int pwm_mediatek_config(struct pwm_chip *chip, struct pwm_device *pwm,

			       int duty_ns, int period_ns)

{
@@ -183,35 +203,6 @@ static int pwm_mediatek_config(struct pwm_chip *chip, struct pwm_device *pwm, 
	return ret;

}



static int pwm_mediatek_enable(struct pwm_chip *chip, struct pwm_device *pwm)

{

	struct pwm_mediatek_chip *pc = to_pwm_mediatek_chip(chip);

	u32 value;

	int ret;



	ret = pwm_mediatek_clk_enable(chip, pwm);

	if (ret < 0)

		return ret;



	value = readl(pc->regs);

	value |= BIT(pwm->hwpwm);

	writel(value, pc->regs);



	return 0;

}



static void pwm_mediatek_disable(struct pwm_chip *chip, struct pwm_device *pwm)

{

	struct pwm_mediatek_chip *pc = to_pwm_mediatek_chip(chip);

	u32 value;



	value = readl(pc->regs);

	value &= ~BIT(pwm->hwpwm);

	writel(value, pc->regs);



	pwm_mediatek_clk_disable(chip, pwm);

}



static int pwm_mediatek_apply(struct pwm_chip *chip, struct pwm_device *pwm,

			      const struct pwm_state *state)

{
@@ -221,8 +212,10 @@ static int pwm_mediatek_apply(struct pwm_chip *chip, struct pwm_device *pwm, 
		return -EINVAL;



	if (!state->enabled) {

		if (pwm->state.enabled)

		if (pwm->state.enabled) {

			pwm_mediatek_disable(chip, pwm);

			pwm_mediatek_clk_disable(chip, pwm);

		}



		return 0;

	}
@@ -231,8 +224,11 @@ static int pwm_mediatek_apply(struct pwm_chip *chip, struct pwm_device *pwm, 
	if (err)

		return err;



	if (!pwm->state.enabled)

		err = pwm_mediatek_enable(chip, pwm);

	if (!pwm->state.enabled) {

		err = pwm_mediatek_clk_enable(chip, pwm);

		if (!err)

			pwm_mediatek_enable(chip, pwm);

	}



	return err;

}