Commit fded0919 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pwm/for-5.9-rc1' of... 

Merge tag 'pwm/for-5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm

Pull pwm updates from Thierry Reding:
 "The majority of this batch is conversion of the PWM period and duty
  cycle to 64-bit unsigned integers, which is required so that some
  types of hardware can generate the full range of signals that they're
  capable of.

  The remainder is mostly minor fixes and cleanups"

* tag 'pwm/for-5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm:
  pwm: bcm-iproc: handle clk_get_rate() return
  pwm: Replace HTTP links with HTTPS ones
  pwm: omap-dmtimer: Repair pwm_omap_dmtimer_chip's broken kerneldoc header
  pwm: mediatek: Provide missing kerneldoc description for 'soc' arg
  pwm: bcm-kona: Remove impossible comparison when validating duty cycle
  pwm: bcm-iproc: Remove impossible comparison when validating duty cycle
  pwm: iqs620a: Use lowercase hexadecimal literals for consistency
  pwm: Convert period and duty cycle to u64
  clk: pwm: Use 64-bit division function
  backlight: pwm_bl: Use 64-bit division function
  pwm: sun4i: Use nsecs_to_jiffies to avoid a division
  pwm: sifive: Use 64-bit division macro
  pwm: iqs620a: Use 64-bit division
  pwm: imx27: Use 64-bit division macro
  pwm: imx-tpm: Use 64-bit division macro
  pwm: clps711x: Use 64-bit division macro
  hwmon: pwm-fan: Use 64-bit division macro
  drm/i915: Use 64-bit division macro
parents 87bd8c2b 6ced5ff0

drivers/clk/clk-pwm.c

+6 −1
Original line number Diff line number Diff line
@@ -89,7 +89,12 @@ static int clk_pwm_probe(struct platform_device *pdev) 
	}



	if (of_property_read_u32(node, "clock-frequency", &clk_pwm->fixed_rate))

		clk_pwm->fixed_rate = NSEC_PER_SEC / pargs.period;

		clk_pwm->fixed_rate = div64_u64(NSEC_PER_SEC, pargs.period);



	if (!clk_pwm->fixed_rate) {

		dev_err(&pdev->dev, "fixed_rate cannot be zero\n");

		return -EINVAL;

	}



	if (pargs.period != NSEC_PER_SEC / clk_pwm->fixed_rate &&

	    pargs.period != DIV_ROUND_UP(NSEC_PER_SEC, clk_pwm->fixed_rate)) {

drivers/gpu/drm/i915/display/intel_panel.c

+1 −1
Original line number Diff line number Diff line
@@ -1929,7 +1929,7 @@ static int pwm_setup_backlight(struct intel_connector *connector, 
		return retval;

	}



	level = DIV_ROUND_UP(pwm_get_duty_cycle(panel->backlight.pwm) * 100,

	level = DIV_ROUND_UP_ULL(pwm_get_duty_cycle(panel->backlight.pwm) * 100,

			     CRC_PMIC_PWM_PERIOD_NS);

	panel->backlight.level =

		intel_panel_compute_brightness(connector, level);

drivers/hwmon/pwm-fan.c

+1 −1
Original line number Diff line number Diff line
@@ -447,7 +447,7 @@ static int pwm_fan_resume(struct device *dev) 
		return 0;



	pwm_get_args(ctx->pwm, &pargs);

	duty = DIV_ROUND_UP(ctx->pwm_value * (pargs.period - 1), MAX_PWM);

	duty = DIV_ROUND_UP_ULL(ctx->pwm_value * (pargs.period - 1), MAX_PWM);

	ret = pwm_config(ctx->pwm, duty, pargs.period);

	if (ret)

		return ret;

drivers/pwm/core.c

+7 −7
Original line number Diff line number Diff line
@@ -510,12 +510,12 @@ static void pwm_apply_state_debug(struct pwm_device *pwm, 
	    last->period > s2.period &&

	    last->period <= state->period)

		dev_warn(chip->dev,

			 ".apply didn't pick the best available period (requested: %u, applied: %u, possible: %u)\n",

			 ".apply didn't pick the best available period (requested: %llu, applied: %llu, possible: %llu)\n",

			 state->period, s2.period, last->period);



	if (state->enabled && state->period < s2.period)

		dev_warn(chip->dev,

			 ".apply is supposed to round down period (requested: %u, applied: %u)\n",

			 ".apply is supposed to round down period (requested: %llu, applied: %llu)\n",

			 state->period, s2.period);



	if (state->enabled &&
@@ -524,14 +524,14 @@ static void pwm_apply_state_debug(struct pwm_device *pwm, 
	    last->duty_cycle > s2.duty_cycle &&

	    last->duty_cycle <= state->duty_cycle)

		dev_warn(chip->dev,

			 ".apply didn't pick the best available duty cycle (requested: %u/%u, applied: %u/%u, possible: %u/%u)\n",

			 ".apply didn't pick the best available duty cycle (requested: %llu/%llu, applied: %llu/%llu, possible: %llu/%llu)\n",

			 state->duty_cycle, state->period,

			 s2.duty_cycle, s2.period,

			 last->duty_cycle, last->period);



	if (state->enabled && state->duty_cycle < s2.duty_cycle)

		dev_warn(chip->dev,

			 ".apply is supposed to round down duty_cycle (requested: %u/%u, applied: %u/%u)\n",

			 ".apply is supposed to round down duty_cycle (requested: %llu/%llu, applied: %llu/%llu)\n",

			 state->duty_cycle, state->period,

			 s2.duty_cycle, s2.period);
@@ -558,7 +558,7 @@ static void pwm_apply_state_debug(struct pwm_device *pwm, 
	    (s1.enabled && s1.period != last->period) ||

	    (s1.enabled && s1.duty_cycle != last->duty_cycle)) {

		dev_err(chip->dev,

			".apply is not idempotent (ena=%d pol=%d %u/%u) -> (ena=%d pol=%d %u/%u)\n",

			".apply is not idempotent (ena=%d pol=%d %llu/%llu) -> (ena=%d pol=%d %llu/%llu)\n",

			s1.enabled, s1.polarity, s1.duty_cycle, s1.period,

			last->enabled, last->polarity, last->duty_cycle,

			last->period);
@@ -1284,8 +1284,8 @@ static void pwm_dbg_show(struct pwm_chip *chip, struct seq_file *s) 
		if (state.enabled)

			seq_puts(s, " enabled");



		seq_printf(s, " period: %u ns", state.period);

		seq_printf(s, " duty: %u ns", state.duty_cycle);

		seq_printf(s, " period: %llu ns", state.period);

		seq_printf(s, " duty: %llu ns", state.duty_cycle);

		seq_printf(s, " polarity: %s",

			   state.polarity ? "inverse" : "normal");

drivers/pwm/pwm-bcm-iproc.c

+8 −4
Original line number Diff line number Diff line
@@ -85,8 +85,6 @@ static void iproc_pwmc_get_state(struct pwm_chip *chip, struct pwm_device *pwm, 
	u64 tmp, multi, rate;

	u32 value, prescale;



	rate = clk_get_rate(ip->clk);



	value = readl(ip->base + IPROC_PWM_CTRL_OFFSET);



	if (value & BIT(IPROC_PWM_CTRL_EN_SHIFT(pwm->hwpwm)))
@@ -99,6 +97,13 @@ static void iproc_pwmc_get_state(struct pwm_chip *chip, struct pwm_device *pwm, 
	else

		state->polarity = PWM_POLARITY_INVERSED;



	rate = clk_get_rate(ip->clk);

	if (rate == 0) {

		state->period = 0;

		state->duty_cycle = 0;

		return;

	}



	value = readl(ip->base + IPROC_PWM_PRESCALE_OFFSET);

	prescale = value >> IPROC_PWM_PRESCALE_SHIFT(pwm->hwpwm);

	prescale &= IPROC_PWM_PRESCALE_MAX;
@@ -143,8 +148,7 @@ static int iproc_pwmc_apply(struct pwm_chip *chip, struct pwm_device *pwm, 
		value = rate * state->duty_cycle;

		duty = div64_u64(value, div);



		if (period < IPROC_PWM_PERIOD_MIN ||

		    duty < IPROC_PWM_DUTY_CYCLE_MIN)

		if (period < IPROC_PWM_PERIOD_MIN)

			return -EINVAL;



		if (period <= IPROC_PWM_PERIOD_MAX &&

CRA Git | Maintained and supported by SUSTech CRA and CCSE