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

Pull pwm changes from Thierry Reding:
 "The set of changes for this merge window contains two new drivers: one
  for Rockchip SoCs and another for STMicroelectronics STiH4xx SoCs.

  The remainder of the changes are the usual small cleanups such as
  removing redundant OOM messages, signalling that a PWM chip's
  operations can sleep and removing an unneeded dependency"

* tag 'pwm/for-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm:
  pwm: rockchip: Added to support for RK3288 SoC
  pwm: rockchip: document RK3288 SoC compatible
  pwm: sti: Remove PWM period table
  pwm: sti: Sync between enable/disable calls
  pwm: sti: Ensure same period values for all channels
  pwm: sti: Fix PWM prescaler handling
  pwm: sti: Supply Device Tree binding documentation for ST's PWM IP
  pwm: sti: Add new driver for ST's PWM IP
  pwm: imx: set can_sleep flag for imx_pwm
  pwm: lpss: remove dependency on clk framework
  pwm: pwm-tipwmss: remove unnecessary OOM messages
  pwm: rockchip: document device tree bindings
  pwm: add Rockchip SoC PWM support

diff --combined drivers/pwm/Kconfig
index 331dfca,fabd0c5..b800783
--- 1/drivers/pwm/Kconfig
--- 2/drivers/pwm/Kconfig
+++ b/drivers/pwm/Kconfig
@@@ -43,7 -43,7 +43,7 @@@ config PWM_AB850
  
  config PWM_ATMEL
        tristate "Atmel PWM support"
 -      depends on ARCH_AT91
 +      depends on ARCH_AT91 || AVR32
        help
          Generic PWM framework driver for Atmel SoC.
  
@@@ -206,6 -206,13 +206,13 @@@ config PWM_RENESAS_TP
          To compile this driver as a module, choose M here: the module
          will be called pwm-renesas-tpu.
  
+ config PWM_ROCKCHIP
+       tristate "Rockchip PWM support"
+       depends on ARCH_ROCKCHIP
+       help
+         Generic PWM framework driver for the PWM controller found on
+         Rockchip SoCs.
+ 
  config PWM_SAMSUNG
        tristate "Samsung PWM support"
        depends on PLAT_SAMSUNG
@@@ -226,6 -233,16 +233,16 @@@ config PWM_SPEA
          To compile this driver as a module, choose M here: the module
          will be called pwm-spear.
  
+ config PWM_STI
+       tristate "STiH4xx PWM support"
+       depends on ARCH_STI
+       depends on OF
+       help
+         Generic PWM framework driver for STiH4xx SoCs.
+ 
+         To compile this driver as a module, choose M here: the module
+         will be called pwm-sti.
+ 
  config PWM_TEGRA
        tristate "NVIDIA Tegra PWM support"
        depends on ARCH_TEGRA