Merge tag 'driver-core-4.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig
index 2f4641a0e88bc3da19e28c3a8e3f432c14f504a9..8cf0dae78555f2bff1f335578c0254b126f6739f 100644 (file)
--- a/drivers/pwm/Kconfig
+++ b/drivers/pwm/Kconfig
@@ -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