Merge branch 'for-3.6' of git://gitorious.org/linux-pwm/linux-pwm

Pull PWM subsystem from Thierry Reding:
 "The new PWM subsystem aims at collecting all implementations of the
  legacy PWM API and to eventually replace it completely.

  The subsystem has been in development for over half a year now and
  many drivers have already been converted.  It has been in linux-next
  for a couple of weeks and there have been no major issues so I think
  it is ready for inclusion in your tree."

Arnd Bergmann <arnd@arndb.de>:
 "Very much Ack on the new subsystem.  It uses the interface
  declarations as the previously separate pwm drivers, so nothing
  changes for now in the drivers using it, although it enables us to
  change those more easily in the future if we want to.

  This work is also one of the missing pieces that are required to
  eventually build ARM kernels for multiple platforms, which is
  currently prohibited (amongs other things) by the fact that you cannot
  have more than one driver exporting the pwm functions."

Tested-and-acked-by: Alexandre Courbot <acourbot@nvidia.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Philip, Avinash <avinashphilip@ti.com> # TI's AM33xx platforms
Acked-By: Alexandre Pereira da Silva <aletes.xgr@gmail.com> # LPC32XX
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Sachin Kamat <sachin.kamat@linaro.org>

Fix up trivial conflicts with other cleanups and DT updates.

* 'for-3.6' of git://gitorious.org/linux-pwm/linux-pwm: (36 commits)
  pwm: pwm-tiehrpwm: PWM driver support for EHRPWM
  pwm: pwm-tiecap: PWM driver support for ECAP APWM
  pwm: fix used-uninitialized warning in pwm_get()
  pwm: add lpc32xx PWM support
  pwm_backlight: pass correct brightness to callback
  pwm: Use pr_* functions in pwm-samsung.c file
  pwm: Convert pwm-samsung to use devm_* APIs
  pwm: Convert pwm-tegra to use devm_clk_get()
  pwm: pwm-mxs: Return proper error if pwmchip_remove() fails
  pwm: pwm-bfin: Return proper error if pwmchip_remove() fails
  pwm: pxa: Propagate pwmchip_remove() error
  pwm: Convert pwm-pxa to use devm_* APIs
  pwm: Convert pwm-vt8500 to use devm_* APIs
  pwm: Convert pwm-imx to use devm_* APIs
  pwm: Conflict with legacy PWM API
  pwm: pwm-mxs: add pinctrl support
  pwm: pwm-mxs: use devm_* managed functions
  pwm: pwm-mxs: use global reset function stmp_reset_block
  pwm: pwm-mxs: encode soc name in compatible string
  pwm: Take over maintainership of the PWM subsystem
  ...

1 files changed, 108 insertions, 0 deletions

diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig
new file mode 100644
index 000000000000..8fc3808d7a3e
--- /dev/null
+++ b/drivers/pwm/Kconfig
@@ -0,0 +1,108 @@
+menuconfig PWM
+        bool "PWM Support"
+        depends on !MACH_JZ4740 && !PUV3_PWM
+        help
+          This enables PWM support through the generic PWM framework.
+          You only need to enable this, if you also want to enable
+          one or more of the PWM drivers below.
+
+          If unsure, say N.
+
+if PWM
+
+config PWM_BFIN
+        tristate "Blackfin PWM support"
+        depends on BFIN_GPTIMERS
+        help
+          Generic PWM framework driver for Blackfin.
+
+          To compile this driver as a module, choose M here: the module
+          will be called pwm-bfin.
+
+config PWM_IMX
+        tristate "i.MX pwm support"
+        depends on ARCH_MXC
+        help
+          Generic PWM framework driver for i.MX.
+
+          To compile this driver as a module, choose M here: the module
+          will be called pwm-imx.
+
+config PWM_LPC32XX
+        tristate "LPC32XX PWM support"
+        depends on ARCH_LPC32XX
+        help
+          Generic PWM framework driver for LPC32XX. The LPC32XX SOC has two
+          PWM controllers.
+
+          To compile this driver as a module, choose M here: the module
+          will be called pwm-lpc32xx.
+
+config PWM_MXS
+        tristate "Freescale MXS PWM support"
+        depends on ARCH_MXS && OF
+        select STMP_DEVICE
+        help
+          Generic PWM framework driver for Freescale MXS.
+
+          To compile this driver as a module, choose M here: the module
+          will be called pwm-mxs.
+
+config PWM_PXA
+        tristate "PXA PWM support"
+        depends on ARCH_PXA
+        help
+          Generic PWM framework driver for PXA.
+
+          To compile this driver as a module, choose M here: the module
+          will be called pwm-pxa.
+
+config PWM_SAMSUNG
+        tristate "Samsung pwm support"
+        depends on PLAT_SAMSUNG
+        help
+          Generic PWM framework driver for Samsung.
+
+          To compile this driver as a module, choose M here: the module
+          will be called pwm-samsung.
+
+config PWM_TEGRA
+        tristate "NVIDIA Tegra PWM support"
+        depends on ARCH_TEGRA
+        help
+          Generic PWM framework driver for the PWFM controller found on NVIDIA
+          Tegra SoCs.
+
+          To compile this driver as a module, choose M here: the module
+          will be called pwm-tegra.
+
+config  PWM_TIECAP
+        tristate "ECAP PWM support"
+        depends on SOC_AM33XX
+        help
+          PWM driver support for the ECAP APWM controller found on AM33XX
+          TI SOC
+
+          To compile this driver as a module, choose M here: the module
+          will be called pwm-tiecap.
+
+config  PWM_TIEHRPWM
+        tristate "EHRPWM PWM support"
+        depends on SOC_AM33XX
+        help
+          PWM driver support for the EHRPWM controller found on AM33XX
+          TI SOC
+
+          To compile this driver as a module, choose M here: the module
+          will be called pwm-tiehrpwm.
+
+config PWM_VT8500
+        tristate "vt8500 pwm support"
+        depends on ARCH_VT8500
+        help
+          Generic PWM framework driver for vt8500.
+
+          To compile this driver as a module, choose M here: the module
+          will be called pwm-vt8500.
+
+endif