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

[cascardo/linux.git] / drivers / pwm / Kconfig

diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig
index 331dfca..b800783 100644 (file)
--- a/drivers/pwm/Kconfig
+++ b/drivers/pwm/Kconfig
@@ -206,6 +206,13 @@ config PWM_RENESAS_TPU
          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 @@ config PWM_SPEAR
          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