Commit 7a693ea7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

Pull pwm updates from Thierry Reding:
 "Various changes across the board, mostly improvements and cleanups"

* tag 'pwm/for-6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm: (42 commits)
  pwm: pca9685: Convert to i2c's .probe_new()
  pwm: sun4i: Propagate errors in .get_state() to the caller
  pwm: Handle .get_state() failures
  pwm: sprd: Propagate errors in .get_state() to the caller
  pwm: rockchip: Propagate errors in .get_state() to the caller
  pwm: mtk-disp: Propagate errors in .get_state() to the caller
  pwm: imx27: Propagate errors in .get_state() to the caller
  pwm: cros-ec: Propagate errors in .get_state() to the caller
  pwm: crc: Propagate errors in .get_state() to the caller
  leds: qcom-lpg: Propagate errors in .get_state() to the caller
  drm/bridge: ti-sn65dsi86: Propagate errors in .get_state() to the caller
  pwm/tracing: Also record trace events for failed API calls
  pwm: Make .get_state() callback return an error code
  pwm: pxa: Enable for MMP platform
  pwm: pxa: Add reference manual link and limitations
  pwm: pxa: Use abrupt shutdown mode
  pwm: pxa: Remove clk enable/disable from pxa_pwm_config
  pwm: pxa: Set duty cycle to 0 when disabling PWM
  pwm: pxa: Remove pxa_pwm_enable/disable
  pwm: mediatek: Add support for MT7986
  ...
parents 9cf5b508 8fa22f4b

Documentation/devicetree/bindings/pwm/renesas,pwm-rcar.yaml

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ properties: 
          - renesas,pwm-r8a77980  # R-Car V3H

          - renesas,pwm-r8a77990  # R-Car E3

          - renesas,pwm-r8a77995  # R-Car D3

          - renesas,pwm-r8a779g0  # R-Car V4H

      - const: renesas,pwm-rcar



  reg:

Documentation/devicetree/bindings/pwm/renesas,tpu-pwm.yaml

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ properties: 
          - renesas,tpu-r8a77970  # R-Car V3M

          - renesas,tpu-r8a77980  # R-Car V3H

          - renesas,tpu-r8a779a0  # R-Car V3U

          - renesas,tpu-r8a779g0  # R-Car V4H

      - const: renesas,tpu



  reg:

drivers/gpio/gpio-mvebu.c

+6 −3
Original line number Diff line number Diff line
@@ -657,9 +657,10 @@ static void mvebu_pwm_free(struct pwm_chip *chip, struct pwm_device *pwm) 
	spin_unlock_irqrestore(&mvpwm->lock, flags);

}



static void mvebu_pwm_get_state(struct pwm_chip *chip,

static int mvebu_pwm_get_state(struct pwm_chip *chip,

			       struct pwm_device *pwm,

				struct pwm_state *state) {

			       struct pwm_state *state)

{



	struct mvebu_pwm *mvpwm = to_mvebu_pwm(chip);

	struct mvebu_gpio_chip *mvchip = mvpwm->mvchip;
@@ -693,6 +694,8 @@ static void mvebu_pwm_get_state(struct pwm_chip *chip, 
		state->enabled = false;



	spin_unlock_irqrestore(&mvpwm->lock, flags);



	return 0;

}



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

drivers/gpu/drm/bridge/ti-sn65dsi86.c

+8 −6
Original line number Diff line number Diff line
@@ -1500,7 +1500,7 @@ static int ti_sn_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm, 
	return ret;

}



static void ti_sn_pwm_get_state(struct pwm_chip *chip, struct pwm_device *pwm,

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

			       struct pwm_state *state)

{

	struct ti_sn65dsi86 *pdata = pwm_chip_to_ti_sn_bridge(chip);
@@ -1512,19 +1512,19 @@ static void ti_sn_pwm_get_state(struct pwm_chip *chip, struct pwm_device *pwm, 


	ret = regmap_read(pdata->regmap, SN_PWM_EN_INV_REG, &pwm_en_inv);

	if (ret)

		return;

		return ret;



	ret = ti_sn65dsi86_read_u16(pdata, SN_BACKLIGHT_SCALE_REG, &scale);

	if (ret)

		return;

		return ret;



	ret = ti_sn65dsi86_read_u16(pdata, SN_BACKLIGHT_REG, &backlight);

	if (ret)

		return;

		return ret;



	ret = regmap_read(pdata->regmap, SN_PWM_PRE_DIV_REG, &pre_div);

	if (ret)

		return;

		return ret;



	state->enabled = FIELD_GET(SN_PWM_EN_MASK, pwm_en_inv);

	if (FIELD_GET(SN_PWM_INV_MASK, pwm_en_inv))
@@ -1539,6 +1539,8 @@ static void ti_sn_pwm_get_state(struct pwm_chip *chip, struct pwm_device *pwm, 


	if (state->duty_cycle > state->period)

		state->duty_cycle = state->period;



	return 0;

}



static const struct pwm_ops ti_sn_pwm_ops = {

drivers/leds/rgb/leds-qcom-lpg.c

+8 −6
Original line number Diff line number Diff line
@@ -972,7 +972,7 @@ static int lpg_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm, 
	return ret;

}



static void lpg_pwm_get_state(struct pwm_chip *chip, struct pwm_device *pwm,

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

			     struct pwm_state *state)

{

	struct lpg *lpg = container_of(chip, struct lpg, pwm);
@@ -986,20 +986,20 @@ static void lpg_pwm_get_state(struct pwm_chip *chip, struct pwm_device *pwm, 


	ret = regmap_read(lpg->map, chan->base + LPG_SIZE_CLK_REG, &val);

	if (ret)

		return;

		return ret;



	refclk = lpg_clk_rates[val & PWM_CLK_SELECT_MASK];

	if (refclk) {

		ret = regmap_read(lpg->map, chan->base + LPG_PREDIV_CLK_REG, &val);

		if (ret)

			return;

			return ret;



		pre_div = lpg_pre_divs[FIELD_GET(PWM_FREQ_PRE_DIV_MASK, val)];

		m = FIELD_GET(PWM_FREQ_EXP_MASK, val);



		ret = regmap_bulk_read(lpg->map, chan->base + PWM_VALUE_REG, &pwm_value, sizeof(pwm_value));

		if (ret)

			return;

			return ret;



		state->period = DIV_ROUND_UP_ULL((u64)NSEC_PER_SEC * LPG_RESOLUTION * pre_div * (1 << m), refclk);

		state->duty_cycle = DIV_ROUND_UP_ULL((u64)NSEC_PER_SEC * pwm_value * pre_div * (1 << m), refclk);
@@ -1010,13 +1010,15 @@ static void lpg_pwm_get_state(struct pwm_chip *chip, struct pwm_device *pwm, 


	ret = regmap_read(lpg->map, chan->base + PWM_ENABLE_CONTROL_REG, &val);

	if (ret)

		return;

		return ret;



	state->enabled = FIELD_GET(LPG_ENABLE_CONTROL_OUTPUT, val);

	state->polarity = PWM_POLARITY_NORMAL;



	if (state->duty_cycle > state->period)

		state->duty_cycle = state->period;



	return 0;

}



static const struct pwm_ops lpg_pwm_ops = {