Commit 80fb2534 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pwm/for-6.12-rc7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux 

Pull pwm fix from Uwe Kleine-König:
 "Fix period setting in imx-tpm driver and a maintainer update

  Erik Schumacher found and fixed a problem in the calculation of the
  PWM period setting yielding too long periods. Trevor Gamblin - who
  already cared about mainlining the pwm-axi-pwmgen driver - stepped
  forward as an additional reviewer.

  Thanks to Erik and Trevor"

* tag 'pwm/for-6.12-rc7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux:
  MAINTAINERS: add self as reviewer for AXI PWM GENERATOR
  pwm: imx-tpm: Use correct MODULO value for EPWM mode
parents 84b9749a 517fb4d7

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -3745,6 +3745,7 @@ F: drivers/spi/spi-axi-spi-engine.c 
AXI PWM GENERATOR

M:	Michael Hennerich <michael.hennerich@analog.com>

M:	Nuno Sá <nuno.sa@analog.com>

R:	Trevor Gamblin <tgamblin@baylibre.com>

L:	linux-pwm@vger.kernel.org

S:	Supported

W:	https://ez.analog.com/linux-software-drivers

drivers/pwm/pwm-imx-tpm.c

+3 −1
Original line number Diff line number Diff line
@@ -106,7 +106,9 @@ static int pwm_imx_tpm_round_state(struct pwm_chip *chip, 
	p->prescale = prescale;



	period_count = (clock_unit + ((1 << prescale) >> 1)) >> prescale;

	p->mod = period_count;

	if (period_count == 0)

		return -EINVAL;

	p->mod = period_count - 1;



	/* calculate real period HW can support */

	tmp = (u64)period_count << prescale;