Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 859e7625 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

Pull pwm updates from Thierry Reding:
 "This set of changes contains a new driver for OMAP (using the
  dual-mode timers) as well as an assortment of fixes all across the
  board"

* tag 'pwm/for-4.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm:
  pwm: Mark all devices as "might sleep"
  pwm: omap-dmtimer: Potential NULL dereference on error
  pwm: add HAS_IOMEM dependency to PWM_FSL_FTM
  pwm: Add PWM driver for OMAP using dual-mode timers
  pwm: rcar: Improve accuracy of frequency division setting
  pwm: lpc32xx: return ERANGE, if requested period is not supported
  pwm: lpc32xx: fix and simplify duty cycle and period calculations
  pwm: lpc32xx: make device usable with common clock framework
  pwm: lpc32xx: correct number of PWM channels from 2 to 1
  dt: lpc32xx: pwm: update documentation of LPC32xx PWM device
  dt: lpc32xx: pwm: correct LPC32xx PWM device node example
  pwm: fsl-ftm: Fix clock enable/disable when using PM
  pwm: lpss: Rework the sequence of programming PWM_SW_UPDATE
  pwm: lpss: Select core part automatically
  pwm: lpss: Update PWM setting for Broxton
  pwm: bcm2835: Fix email address specification
  pwm: bcm2835: Prevent division by zero
  pwm: bcm2835: Calculate scaler in ->config()
  pwm: lpss: Remove ->free() callback
parents 96461fdb ff01c944

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

+7 −2
Original line number Diff line number Diff line
@@ -6,7 +6,12 @@ Required properties: 


Examples:



pwm@0x4005C000 {

pwm@4005c000 {

	compatible = "nxp,lpc3220-pwm";

	reg = <0x4005C000 0x8>;

	reg = <0x4005c000 0x4>;

};



pwm@4005c004 {

	compatible = "nxp,lpc3220-pwm";

	reg = <0x4005c004 0x4>;

};

Documentation/devicetree/bindings/pwm/pwm-omap-dmtimer.txt

0 → 100644
+18 −0
Original line number Diff line number Diff line 
* OMAP PWM for dual-mode timers



Required properties:

- compatible: Shall contain "ti,omap-dmtimer-pwm".

- ti,timers: phandle to PWM capable OMAP timer. See arm/omap/timer.txt for info

  about these timers.

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

  the cells format.



Optional properties:

- ti,prescaler: Should be a value between 0 and 7, see the timers datasheet



Example:

	pwm9: dmtimer-pwm@9 {

		compatible = "ti,omap-dmtimer-pwm";

		ti,timers = <&timer9>;

		#pwm-cells = <3>;

	};

drivers/pwm/Kconfig

+15 −10
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ config PWM_EP93XX 


config PWM_FSL_FTM

	tristate "Freescale FlexTimer Module (FTM) PWM support"

	depends on HAS_IOMEM

	depends on OF

	select REGMAP_MMIO

	help
@@ -222,18 +223,12 @@ config PWM_LPC32XX 
	  will be called pwm-lpc32xx.



config PWM_LPSS

	tristate "Intel LPSS PWM support"

	depends on X86

	help

	  Generic PWM framework driver for Intel Low Power Subsystem PWM

	  controller.



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

	  will be called pwm-lpss.

	tristate



config PWM_LPSS_PCI

	tristate "Intel LPSS PWM PCI driver"

	depends on PWM_LPSS && PCI

	depends on X86 && PCI

	select PWM_LPSS

	help

	  The PCI driver for Intel Low Power Subsystem PWM controller.
@@ -242,7 +237,8 @@ config PWM_LPSS_PCI 


config PWM_LPSS_PLATFORM

	tristate "Intel LPSS PWM platform driver"

	depends on PWM_LPSS && ACPI

	depends on X86 && ACPI

	select PWM_LPSS

	help

	  The platform driver for Intel Low Power Subsystem PWM controller.
@@ -270,6 +266,15 @@ config PWM_MXS 
	  To compile this driver as a module, choose M here: the module

	  will be called pwm-mxs.



config PWM_OMAP_DMTIMER

	tristate "OMAP Dual-Mode Timer PWM support"

	depends on OF && ARCH_OMAP && OMAP_DM_TIMER

	help

	  Generic PWM framework driver for OMAP Dual-Mode Timer PWM output



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

	  will be called pwm-omap-dmtimer



config PWM_PCA9685

	tristate "NXP PCA9685 PWM driver"

	depends on I2C

drivers/pwm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ obj-$(CONFIG_PWM_LPSS_PCI) += pwm-lpss-pci.o 
obj-$(CONFIG_PWM_LPSS_PLATFORM)	+= pwm-lpss-platform.o

obj-$(CONFIG_PWM_MTK_DISP)	+= pwm-mtk-disp.o

obj-$(CONFIG_PWM_MXS)		+= pwm-mxs.o

obj-$(CONFIG_PWM_OMAP_DMTIMER)	+= pwm-omap-dmtimer.o

obj-$(CONFIG_PWM_PCA9685)	+= pwm-pca9685.o

obj-$(CONFIG_PWM_PUV3)		+= pwm-puv3.o

obj-$(CONFIG_PWM_PXA)		+= pwm-pxa.o

drivers/pwm/core.c

+1 −1
Original line number Diff line number Diff line
@@ -889,7 +889,7 @@ EXPORT_SYMBOL_GPL(devm_pwm_put); 
  */

bool pwm_can_sleep(struct pwm_device *pwm)

{

	return pwm->chip->can_sleep;

	return true;

}

EXPORT_SYMBOL_GPL(pwm_can_sleep);