Commit 58803adc authored by Uwe Kleine-König's avatar Uwe Kleine-König
Browse files

pwm: vt8500: Change prototype of a helper to prepare further changes 

This prepares the driver for further changes that will make it harder to
determine the pwm_chip from a given vt8500_chip. To just not have to do
that, rework vt8500_pwm_busy_wait() to take a pwm_chip.

Link: https://lore.kernel.org/r/fb384c550b359e7707219f87872bcf36482875ff.1707900770.git.u.kleine-koenig@pengutronix.de


Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
parent 7fe09324

drivers/pwm/pwm-vt8500.c

+10 −9
Original line number Diff line number Diff line
@@ -53,8 +53,9 @@ struct vt8500_chip { 
#define to_vt8500_chip(chip)	container_of(chip, struct vt8500_chip, chip)



#define msecs_to_loops(t) (loops_per_jiffy / 1000 * HZ * t)

static inline void vt8500_pwm_busy_wait(struct vt8500_chip *vt8500, int nr, u8 bitmask)

static inline void vt8500_pwm_busy_wait(struct pwm_chip *chip, int nr, u8 bitmask)

{

	struct vt8500_chip *vt8500 = to_vt8500_chip(chip);

	int loops = msecs_to_loops(10);

	u32 mask = bitmask << (nr << 8);
@@ -62,7 +63,7 @@ static inline void vt8500_pwm_busy_wait(struct vt8500_chip *vt8500, int nr, u8 b 
		cpu_relax();



	if (unlikely(!loops))

		dev_warn(vt8500->chip.dev, "Waiting for status bits 0x%x to clear timed out\n",

		dev_warn(chip->dev, "Waiting for status bits 0x%x to clear timed out\n",

			 mask);

}
@@ -103,18 +104,18 @@ static int vt8500_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm, 
	dc = div64_u64(c, period_ns);



	writel(prescale, vt8500->base + REG_SCALAR(pwm->hwpwm));

	vt8500_pwm_busy_wait(vt8500, pwm->hwpwm, STATUS_SCALAR_UPDATE);

	vt8500_pwm_busy_wait(chip, pwm->hwpwm, STATUS_SCALAR_UPDATE);



	writel(pv, vt8500->base + REG_PERIOD(pwm->hwpwm));

	vt8500_pwm_busy_wait(vt8500, pwm->hwpwm, STATUS_PERIOD_UPDATE);

	vt8500_pwm_busy_wait(chip, pwm->hwpwm, STATUS_PERIOD_UPDATE);



	writel(dc, vt8500->base + REG_DUTY(pwm->hwpwm));

	vt8500_pwm_busy_wait(vt8500, pwm->hwpwm, STATUS_DUTY_UPDATE);

	vt8500_pwm_busy_wait(chip, pwm->hwpwm, STATUS_DUTY_UPDATE);



	val = readl(vt8500->base + REG_CTRL(pwm->hwpwm));

	val |= CTRL_AUTOLOAD;

	writel(val, vt8500->base + REG_CTRL(pwm->hwpwm));

	vt8500_pwm_busy_wait(vt8500, pwm->hwpwm, STATUS_CTRL_UPDATE);

	vt8500_pwm_busy_wait(chip, pwm->hwpwm, STATUS_CTRL_UPDATE);



	clk_disable(vt8500->clk);

	return 0;
@@ -135,7 +136,7 @@ static int vt8500_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm) 
	val = readl(vt8500->base + REG_CTRL(pwm->hwpwm));

	val |= CTRL_ENABLE;

	writel(val, vt8500->base + REG_CTRL(pwm->hwpwm));

	vt8500_pwm_busy_wait(vt8500, pwm->hwpwm, STATUS_CTRL_UPDATE);

	vt8500_pwm_busy_wait(chip, pwm->hwpwm, STATUS_CTRL_UPDATE);



	return 0;

}
@@ -148,7 +149,7 @@ static void vt8500_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm) 
	val = readl(vt8500->base + REG_CTRL(pwm->hwpwm));

	val &= ~CTRL_ENABLE;

	writel(val, vt8500->base + REG_CTRL(pwm->hwpwm));

	vt8500_pwm_busy_wait(vt8500, pwm->hwpwm, STATUS_CTRL_UPDATE);

	vt8500_pwm_busy_wait(chip, pwm->hwpwm, STATUS_CTRL_UPDATE);



	clk_disable(vt8500->clk);

}
@@ -168,7 +169,7 @@ static int vt8500_pwm_set_polarity(struct pwm_chip *chip, 
		val &= ~CTRL_INVERT;



	writel(val, vt8500->base + REG_CTRL(pwm->hwpwm));

	vt8500_pwm_busy_wait(vt8500, pwm->hwpwm, STATUS_CTRL_UPDATE);

	vt8500_pwm_busy_wait(chip, pwm->hwpwm, STATUS_CTRL_UPDATE);



	return 0;

}