Commit 9433a51e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

Pull pwm updates from Thierry Reding:
 "Nothing too exciting for this cycle. A couple of fixes across the
  board, and Lee volunteered to help with patch review"

* tag 'pwm/for-5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm:
  pwm: Add missing "CONFIG_" prefix
  MAINTAINERS: Add Lee Jones as reviewer for the PWM subsystem
  pwm: imx27: Fix rounding behavior
  pwm: rockchip: Simplify rockchip_pwm_get_state()
  pwm: img: Call pm_runtime_put() in pm_runtime_get_sync() failed case
  pwm: tegra: Support dynamic clock frequency configuration
  pwm: jz4740: Add support for the JZ4725B
  pwm: jz4740: Make PWM start with the active part
  pwm: jz4740: Enhance precision in calculation of duty cycle
  pwm: jz4740: Drop dependency on MACH_INGENIC
  pwm: lpss: Fix get_state runtime-pm reference handling
  pwm: sun4i: Support direct clock output on Allwinner A64
  pwm: Add support for Azoteq IQS620A PWM generator
  dt-bindings: pwm: rcar: add r8a77961 support
  pwm: Add missing '\n' in log messages
parents 8f02f363 f5641d05

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

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ properties: 
          - renesas,pwm-r8a7794   # R-Car E2

          - renesas,pwm-r8a7795   # R-Car H3

          - renesas,pwm-r8a7796   # R-Car M3-W

          - renesas,pwm-r8a77961  # R-Car M3-W+

          - renesas,pwm-r8a77965  # R-Car M3-N

          - renesas,pwm-r8a77970  # R-Car V3M

          - renesas,pwm-r8a77980  # R-Car V3H

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -13919,6 +13919,7 @@ F: drivers/media/rc/pwm-ir-tx.c 
PWM SUBSYSTEM

M:	Thierry Reding <thierry.reding@gmail.com>

R:	Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

M:	Lee Jones <lee.jones@linaro.org>

L:	linux-pwm@vger.kernel.org

S:	Maintained

Q:	https://patchwork.ozlabs.org/project/linux-pwm/list/

drivers/pwm/Kconfig

+11 −1
Original line number Diff line number Diff line
@@ -232,9 +232,19 @@ config PWM_IMX_TPM 
	  To compile this driver as a module, choose M here: the module

	  will be called pwm-imx-tpm.



config PWM_IQS620A

	tristate "Azoteq IQS620A PWM support"

	depends on MFD_IQS62X || COMPILE_TEST

	help

	  Generic PWM framework driver for the Azoteq IQS620A multi-function

	  sensor.



	  To compile this driver as a module, choose M here: the module will

	  be called pwm-iqs620a.



config PWM_JZ4740

	tristate "Ingenic JZ47xx PWM support"

	depends on MACH_INGENIC

	depends on MIPS

	depends on COMMON_CLK

	select MFD_SYSCON

	help

drivers/pwm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ obj-$(CONFIG_PWM_IMG) += pwm-img.o 
obj-$(CONFIG_PWM_IMX1)		+= pwm-imx1.o

obj-$(CONFIG_PWM_IMX27)		+= pwm-imx27.o

obj-$(CONFIG_PWM_IMX_TPM)	+= pwm-imx-tpm.o

obj-$(CONFIG_PWM_IQS620A)	+= pwm-iqs620a.o

obj-$(CONFIG_PWM_JZ4740)	+= pwm-jz4740.o

obj-$(CONFIG_PWM_LP3943)	+= pwm-lp3943.o

obj-$(CONFIG_PWM_LPC18XX_SCT)	+= pwm-lpc18xx-sct.o

drivers/pwm/core.c

+2 −2
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ static int pwm_device_request(struct pwm_device *pwm, const char *label) 
		pwm->chip->ops->get_state(pwm->chip, pwm, &pwm->state);

		trace_pwm_get(pwm, &pwm->state);



		if (IS_ENABLED(PWM_DEBUG))

		if (IS_ENABLED(CONFIG_PWM_DEBUG))

			pwm->last = pwm->state;

	}
@@ -537,7 +537,7 @@ static void pwm_apply_state_debug(struct pwm_device *pwm, 


	if (!state->enabled && s2.enabled && s2.duty_cycle > 0)

		dev_warn(chip->dev,

			 "requested disabled, but yielded enabled with duty > 0");

			 "requested disabled, but yielded enabled with duty > 0\n");



	/* reapply the state that the driver reported being configured. */

	err = chip->ops->apply(chip, pwm, &s1);

CRA Git | Maintained and supported by SUSTech CRA and CCSE