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

Commit 9712d3c3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

Pull pwm changes from Thierry Reding:
 "The legacy HAVE_PWM Kconfig symbol is finally being retired.  Thanks a
  lot to Sascha Hauer for doing that.

  Three new drivers are added: Freescale FTM, Cirrus Logic CLPS711X and
  Intel Low Power Subsystem.

  An assortment of fixes and cleanups rounds things off for this release
  cycle"

* tag 'pwm/for-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm:
  pwm: pxa: Constify OF match table
  pwm: pxa: Fix typo "pwm" -> "PWM"
  Revert "pwm: pxa: Use of_match_ptr()"
  pwm: add support for Intel Low Power Subsystem PWM
  pwm: Add CLPS711X PWM support
  pwm: atmel: correct CDTY calculation
  pwm: atmel: Fix polarity handling
  Documentation: Add device tree bindings for Freescale FTM PWM.
  pwm: Add Freescale FTM PWM driver support
  pwm: pxa: Use of_match_ptr()
  pwm: samsung: Use SIMPLE_DEV_PM_OPS macro
  pwm: renesas-tpu: Add dependency on HAS_IOMEM
  pwm: Remove obsolete HAVE_PWM Kconfig symbol
parents 2bf73dd6 2ae69a46

Documentation/devicetree/bindings/pwm/cirrus,clps711x-pwm.txt

0 → 100644
+16 −0
Original line number Diff line number Diff line 
* Cirris Logic CLPS711X PWM controller



Required properties:

- compatible: Shall contain "cirrus,clps711x-pwm".

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

- clocks: phandle + clock specifier pair of the PWM reference clock.

- #pwm-cells: Should be 1. The cell specifies the index of the channel.



Example:

	pwm: pwm@80000400 {

		compatible = "cirrus,ep7312-pwm",

			     "cirrus,clps711x-pwm";

		reg = <0x80000400 0x4>;

		clocks = <&clks 8>;

		#pwm-cells = <1>;

	};

Documentation/devicetree/bindings/pwm/pwm-fsl-ftm.txt

0 → 100644
+35 −0
Original line number Diff line number Diff line 
Freescale FlexTimer Module (FTM) PWM controller



Required properties:

- compatible: Should be "fsl,vf610-ftm-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.

- clock-names: Should include the following module clock source entries:

    "ftm_sys" (module clock, also can be used as counter clock),

    "ftm_ext" (external counter clock),

    "ftm_fix" (fixed counter clock),

    "ftm_cnt_clk_en" (external and fixed counter clock enable/disable).

- clocks: Must contain a phandle and clock specifier for each entry in

  clock-names, please see clock/clock-bindings.txt for details of the property

  values.

- pinctrl-names: Must contain a "default" entry.

- pinctrl-NNN: One property must exist for each entry in pinctrl-names.

  See pinctrl/pinctrl-bindings.txt for details of the property values.





Example:



pwm0: pwm@40038000 {

		compatible = "fsl,vf610-ftm-pwm";

		reg = <0x40038000 0x1000>;

		#pwm-cells = <3>;

		clock-names = "ftm_sys", "ftm_ext",

				"ftm_fix", "ftm_cnt_clk_en";

		clocks = <&clks VF610_CLK_FTM0>,

			<&clks VF610_CLK_FTM0_EXT_SEL>,

			<&clks VF610_CLK_FTM0_FIX_SEL>,

			<&clks VF610_CLK_FTM0_EXT_FIX_EN>;

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_pwm0_1>;

};

arch/arm/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -113,9 +113,6 @@ config ARM_DMA_IOMMU_ALIGNMENT 


endif



config HAVE_PWM

	bool



config MIGHT_HAVE_PCI

	bool
@@ -633,7 +630,6 @@ config ARCH_LPC32XX 
	select CPU_ARM926T

	select GENERIC_CLOCKEVENTS

	select HAVE_IDE

	select HAVE_PWM

	select USE_OF

	help

	  Support for the NXP LPC32XX family of processors

arch/arm/mach-pxa/Kconfig

+0 −14
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ comment "Intel/Marvell Dev Platforms (sorted by hardware release time)" 
config MACH_PXA3XX_DT

	bool "Support PXA3xx platforms from device tree"

	select CPU_PXA300

	select HAVE_PWM

	select POWER_SUPPLY

	select PXA3xx

	select USE_OF
@@ -23,12 +22,10 @@ config ARCH_LUBBOCK 


config MACH_MAINSTONE

	bool "Intel HCDDBBVA0 Development Platform (aka Mainstone)"

	select HAVE_PWM

	select PXA27x



config MACH_ZYLONITE

	bool

	select HAVE_PWM

	select PXA3xx



config MACH_ZYLONITE300
@@ -123,7 +120,6 @@ config MACH_CM_X300 
	bool "CompuLab CM-X300 modules"

	select CPU_PXA300

	select CPU_PXA310

	select HAVE_PWM

	select PXA3xx



config MACH_CAPC7117
@@ -214,7 +210,6 @@ config TRIZEPS_PCMCIA 


config MACH_LOGICPD_PXA270

	bool "LogicPD PXA270 Card Engine Development Platform"

	select HAVE_PWM

	select PXA27x



config MACH_PCM027
@@ -225,7 +220,6 @@ config MACH_PCM027 
config MACH_PCM990_BASEBOARD

	bool "PHYTEC PCM-990 development board"

	depends on MACH_PCM027

	select HAVE_PWM



choice

	prompt "display on pcm990"
@@ -249,7 +243,6 @@ config MACH_COLIBRI 
config MACH_COLIBRI_PXA270_INCOME

	bool "Income s.r.o. PXA270 SBC"

	depends on MACH_COLIBRI

	select HAVE_PWM

	select PXA27x



config MACH_COLIBRI300
@@ -278,7 +271,6 @@ comment "End-user Products (sorted by vendor name)" 


config MACH_H4700

	bool "HP iPAQ hx4700"

	select HAVE_PWM

	select IWMMXT

	select PXA27x
@@ -292,14 +284,12 @@ config MACH_HIMALAYA 


config MACH_MAGICIAN

	bool "Enable HTC Magician Support"

	select HAVE_PWM

	select IWMMXT

	select PXA27x



config MACH_MIOA701

	bool "Mitac Mio A701 Support"

	select GPIO_SYSFS

	select HAVE_PWM

	select IWMMXT

	select PXA27x

	help
@@ -309,7 +299,6 @@ config MACH_MIOA701 


config PXA_EZX

	bool "Motorola EZX Platform"

	select HAVE_PWM

	select IWMMXT

	select PXA27x
@@ -349,7 +338,6 @@ config MACH_MP900C 


config ARCH_PXA_PALM

	bool "PXA based Palm PDAs"

	select HAVE_PWM



config MACH_PALM27X

	bool
@@ -447,7 +435,6 @@ config MACH_TREO680 
config MACH_RAUMFELD_RC

	bool "Raumfeld Controller"

	select CPU_PXA300

	select HAVE_PWM

	select POWER_SUPPLY

	select PXA3xx
@@ -611,7 +598,6 @@ config MACH_E800 


config MACH_ZIPIT2

	bool "Zipit Z2 Handheld"

	select HAVE_PWM

	select PXA27x

endmenu

drivers/input/misc/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ config INPUT_MAX8925_ONKEY 


config INPUT_MAX8997_HAPTIC

	tristate "MAXIM MAX8997 haptic controller support"

	depends on PWM && HAVE_PWM && MFD_MAX8997

	depends on PWM && MFD_MAX8997

	select INPUT_FF_MEMLESS

	help

	  This option enables device driver support for the haptic controller
@@ -470,7 +470,7 @@ config INPUT_PCF8574 


config INPUT_PWM_BEEPER

	tristate "PWM beeper support"

	depends on PWM && HAVE_PWM

	depends on PWM

	help

	  Say Y here to get support for PWM based beeper devices.