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

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

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

Pull pwm updates from Thierry Reding:
 "Nothing out of the ordinary this cycle.

  The bulk of this is a collection of fixes for existing drivers and
  some cleanups. There's one new driver for i.MX SoCs and addition of
  support for some new variants to existing drivers"

* tag 'pwm/for-5.2-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm:
  pwm: meson: Add clock source configuration for Meson G12A
  dt-bindings: pwm: Update bindings for the Meson G12A Family
  pwm: samsung: Don't uses devm_*() functions in ->request()
  pwm: Clear chip_data in pwm_put()
  pwm: Add i.MX TPM PWM driver support
  dt-bindings: pwm: Add i.MX TPM PWM binding
  pwm: imx27: Use devm_platform_ioremap_resource() to simplify code
  pwm: meson: Use the spin-lock only to protect register modifications
  pwm: meson: Don't disable PWM when setting duty repeatedly
  pwm: meson: Consider 128 a valid pre-divider
  pwm: sysfs: fix typo "its" -> "it's"
  pwm: tiehrpwm: Enable compilation for ARCH_K3
  dt-bindings: pwm: tiehrpwm: Add TI AM654 SoC specific compatible
  pwm: tiehrpwm: Update shadow register for disabling PWMs
  pwm: img: Turn final 'else if' into 'else' in img_pwm_config
  pwm: Fix deadlock warning when removing PWM device
parents 15500c0a f41efceb

Documentation/devicetree/bindings/pwm/imx-tpm-pwm.txt

0 → 100644
+22 −0
Original line number Diff line number Diff line 
Freescale i.MX TPM PWM controller



Required properties:

- compatible : Should be "fsl,imx7ulp-pwm".

- reg: Physical base address and length of the controller's registers.

- #pwm-cells: Should be 3. See pwm.txt in this directory for a description of the cells format.

- clocks : The clock provided by the SoC to drive the PWM.

- interrupts: The interrupt for the PWM controller.



Note: The TPM counter and period counter are shared between multiple channels, so all channels

should use same period setting.



Example:



tpm4: pwm@40250000 {

	compatible = "fsl,imx7ulp-pwm";

	reg = <0x40250000 0x1000>;

	assigned-clocks = <&pcc2 IMX7ULP_CLK_LPTPM4>;

	assigned-clock-parents = <&scg1 IMX7ULP_CLK_SOSC_BUS_CLK>;

	clocks = <&pcc2 IMX7ULP_CLK_LPTPM4>;

	#pwm-cells = <3>;

};

Documentation/devicetree/bindings/pwm/pwm-meson.txt

+3 −0
Original line number Diff line number Diff line
@@ -7,6 +7,9 @@ Required properties: 
                         or "amlogic,meson-gxbb-ao-pwm"

                         or "amlogic,meson-axg-ee-pwm"

                         or "amlogic,meson-axg-ao-pwm"

                         or "amlogic,meson-g12a-ee-pwm"

                         or "amlogic,meson-g12a-ao-pwm-ab"

                         or "amlogic,meson-g12a-ao-pwm-cd"

- #pwm-cells: Should be 3. See pwm.txt in this directory for a description of

  the cells format.

Documentation/devicetree/bindings/pwm/pwm-tiehrpwm.txt

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ Required properties: 
- compatible: Must be "ti,<soc>-ehrpwm".

  for am33xx  - compatible = "ti,am3352-ehrpwm", "ti,am33xx-ehrpwm";

  for am4372  - compatible = "ti,am4372-ehrpwm", "ti-am3352-ehrpwm", "ti,am33xx-ehrpwm";

  for am654   - compatible = "ti,am654-ehrpwm", "ti-am3352-ehrpwm";

  for da850   - compatible = "ti,da850-ehrpwm", "ti-am3352-ehrpwm", "ti,am33xx-ehrpwm";

  for dra746 - compatible = "ti,dra746-ehrpwm", "ti-am3352-ehrpwm";

- #pwm-cells: should be 3. See pwm.txt in this directory for a description of

drivers/pwm/Kconfig

+13 −3
Original line number Diff line number Diff line
@@ -210,6 +210,17 @@ config PWM_IMX27 
	  To compile this driver as a module, choose M here: the module

	  will be called pwm-imx27.



config PWM_IMX_TPM

	tristate "i.MX TPM PWM support"

	depends on ARCH_MXC || COMPILE_TEST

	depends on HAVE_CLK && HAS_IOMEM

	help

	  Generic PWM framework driver for i.MX7ULP TPM module, TPM's full

	  name is Low Power Timer/Pulse Width Modulation Module.



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

	  will be called pwm-imx-tpm.



config PWM_JZ4740

	tristate "Ingenic JZ47xx PWM support"

	depends on MACH_INGENIC
@@ -467,10 +478,9 @@ config PWM_TIECAP 


config  PWM_TIEHRPWM

	tristate "EHRPWM PWM support"

	depends on ARCH_OMAP2PLUS || ARCH_DAVINCI_DA8XX

	depends on ARCH_OMAP2PLUS || ARCH_DAVINCI_DA8XX || ARCH_K3

	help

	  PWM driver support for the EHRPWM controller found on AM33XX

	  TI SOC

	  PWM driver support for the EHRPWM controller found on TI SOCs



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

	  will be called pwm-tiehrpwm.

drivers/pwm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ obj-$(CONFIG_PWM_HIBVT) += pwm-hibvt.o 
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_JZ4740)	+= pwm-jz4740.o

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

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE