Commit 6701e7e7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

Pull pwm updates from Thierry Reding:
 "The changes this time around are mostly janitorial in nature. A lot of
  this is simplifications of drivers using device-managed functions and
  improving compilation coverage.

  The Mediatek display PWM driver now supports the atomic API.

  Cleanups and minor fixes make up the remainder of this set"

* tag 'pwm/for-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm: (54 commits)
  pwm: mtk-disp: Implement atomic API .get_state()
  pwm: mtk-disp: Fix overflow in period and duty calculation
  pwm: mtk-disp: Implement atomic API .apply()
  pwm: mtk-disp: Adjust the clocks to avoid them mismatch
  dt-bindings: pwm: rockchip: Add description for rk3568
  pwm: Make pwmchip_remove() return void
  pwm: sun4i: Don't check the return code of pwmchip_remove()
  pwm: sifive: Don't check the return code of pwmchip_remove()
  pwm: samsung: Don't check the return code of pwmchip_remove()
  pwm: renesas-tpu: Don't check the return code of pwmchip_remove()
  pwm: rcar: Don't check the return code of pwmchip_remove()
  pwm: pca9685: Don't check the return code of pwmchip_remove()
  pwm: omap-dmtimer: Don't check the return code of pwmchip_remove()
  pwm: mtk-disp: Don't check the return code of pwmchip_remove()
  pwm: imx-tpm: Don't check the return code of pwmchip_remove()
  pwm: img: Don't check the return code of pwmchip_remove()
  pwm: cros-ec: Don't check the return code of pwmchip_remove()
  pwm: brcmstb: Don't check the return code of pwmchip_remove()
  pwm: atmel-tcb: Don't check the return code of pwmchip_remove()
  pwm: atmel-hlcdc: Don't check the return code of pwmchip_remove()
  ...
parents dd470387 3f2b1673

Documentation/devicetree/bindings/pwm/pwm-rockchip.yaml

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ properties: 
          - enum:

              - rockchip,px30-pwm

              - rockchip,rk3308-pwm

              - rockchip,rk3568-pwm

          - const: rockchip,rk3328-pwm



  reg:

drivers/pwm/Kconfig

+3 −2
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ config PWM_IQS620A 


config PWM_JZ4740

	tristate "Ingenic JZ47xx PWM support"

	depends on MIPS

	depends on MIPS || COMPILE_TEST

	depends on COMMON_CLK

	select MFD_SYSCON

	help
@@ -284,7 +284,8 @@ config PWM_JZ4740 


config PWM_KEEMBAY

	tristate "Intel Keem Bay PWM driver"

	depends on ARCH_KEEMBAY || (ARM64 && COMPILE_TEST)

	depends on ARCH_KEEMBAY || COMPILE_TEST

	depends on COMMON_CLK && HAS_IOMEM

	help

	  The platform driver for Intel Keem Bay PWM controller.

drivers/pwm/core.c

+1 −3
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ EXPORT_SYMBOL_GPL(pwmchip_add); 
 *

 * Returns: 0 on success or a negative error code on failure.

 */

int pwmchip_remove(struct pwm_chip *chip)

void pwmchip_remove(struct pwm_chip *chip)

{

	pwmchip_sysfs_unexport(chip);
@@ -318,8 +318,6 @@ int pwmchip_remove(struct pwm_chip *chip) 
	free_pwms(chip);



	mutex_unlock(&pwm_lock);



	return 0;

}

EXPORT_SYMBOL_GPL(pwmchip_remove);

drivers/pwm/pwm-ab8500.c

+15 −20
Original line number Diff line number Diff line
@@ -22,14 +22,21 @@ 


struct ab8500_pwm_chip {

	struct pwm_chip chip;

	unsigned int hwid;

};



static struct ab8500_pwm_chip *ab8500_pwm_from_chip(struct pwm_chip *chip)

{

	return container_of(chip, struct ab8500_pwm_chip, chip);

}



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

			    const struct pwm_state *state)

{

	int ret;

	u8 reg;

	unsigned int higher_val, lower_val;

	struct ab8500_pwm_chip *ab8500 = ab8500_pwm_from_chip(chip);



	if (state->polarity != PWM_POLARITY_NORMAL)

		return -EINVAL;
@@ -37,7 +44,7 @@ static int ab8500_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm, 
	if (!state->enabled) {

		ret = abx500_mask_and_set_register_interruptible(chip->dev,

					AB8500_MISC, AB8500_PWM_OUT_CTRL7_REG,

					1 << (chip->base - 1), 0);

					1 << ab8500->hwid, 0);



		if (ret < 0)

			dev_err(chip->dev, "%s: Failed to disable PWM, Error %d\n",
@@ -56,7 +63,7 @@ static int ab8500_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm, 
	 */

	higher_val = ((state->duty_cycle & 0x0300) >> 8);



	reg = AB8500_PWM_OUT_CTRL1_REG + ((chip->base - 1) * 2);

	reg = AB8500_PWM_OUT_CTRL1_REG + (ab8500->hwid * 2);



	ret = abx500_set_register_interruptible(chip->dev, AB8500_MISC,

			reg, (u8)lower_val);
@@ -70,7 +77,7 @@ static int ab8500_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm, 


	ret = abx500_mask_and_set_register_interruptible(chip->dev,

				AB8500_MISC, AB8500_PWM_OUT_CTRL7_REG,

				1 << (chip->base - 1), 1 << (chip->base - 1));

				1 << ab8500->hwid, 1 << ab8500->hwid);

	if (ret < 0)

		dev_err(chip->dev, "%s: Failed to enable PWM, Error %d\n",

							pwm->label, ret);
@@ -88,6 +95,9 @@ static int ab8500_pwm_probe(struct platform_device *pdev) 
	struct ab8500_pwm_chip *ab8500;

	int err;



	if (pdev->id < 1 || pdev->id > 31)

		return dev_err_probe(&pdev->dev, EINVAL, "Invalid device id %d\n", pdev->id);



	/*

	 * Nothing to be done in probe, this is required to get the

	 * device which is required for ab8500 read and write
@@ -99,27 +109,13 @@ static int ab8500_pwm_probe(struct platform_device *pdev) 
	ab8500->chip.dev = &pdev->dev;

	ab8500->chip.ops = &ab8500_pwm_ops;

	ab8500->chip.npwm = 1;

	ab8500->hwid = pdev->id - 1;



	err = pwmchip_add(&ab8500->chip);

	err = devm_pwmchip_add(&pdev->dev, &ab8500->chip);

	if (err < 0)

		return dev_err_probe(&pdev->dev, err, "Failed to add pwm chip\n");



	dev_dbg(&pdev->dev, "pwm probe successful\n");

	platform_set_drvdata(pdev, ab8500);



	return 0;

}



static int ab8500_pwm_remove(struct platform_device *pdev)

{

	struct ab8500_pwm_chip *ab8500 = platform_get_drvdata(pdev);

	int err;



	err = pwmchip_remove(&ab8500->chip);

	if (err < 0)

		return err;



	dev_dbg(&pdev->dev, "pwm driver removed\n");



	return 0;

}
@@ -129,7 +125,6 @@ static struct platform_driver ab8500_pwm_driver = { 
		.name = "ab8500-pwm",

	},

	.probe = ab8500_pwm_probe,

	.remove = ab8500_pwm_remove,

};

module_platform_driver(ab8500_pwm_driver);

drivers/pwm/pwm-atmel-hlcdc.c

+1 −4
Original line number Diff line number Diff line
@@ -281,11 +281,8 @@ static int atmel_hlcdc_pwm_probe(struct platform_device *pdev) 
static int atmel_hlcdc_pwm_remove(struct platform_device *pdev)

{

	struct atmel_hlcdc_pwm *chip = platform_get_drvdata(pdev);

	int ret;



	ret = pwmchip_remove(&chip->chip);

	if (ret)

		return ret;

	pwmchip_remove(&chip->chip);



	clk_disable_unprepare(chip->hlcdc->periph_clk);