Merge remote-tracking branches 'asoc/fix/ak4671', 'asoc/fix/control', 'asoc/fix/da732...

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

diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig
index a3ecf58096348cbe391522ae83cd85bb0195ea02..b1541f40fd8d19cc0d1ef6a39e86b1dbe8d573fa 100644 (file)
--- a/drivers/pwm/Kconfig
+++ b/drivers/pwm/Kconfig
@@ -53,6 +53,7 @@ config PWM_ATMEL
 config PWM_ATMEL_HLCDC_PWM
        tristate "Atmel HLCDC PWM support"
        depends on MFD_ATMEL_HLCDC
+       depends on HAVE_CLK
        help
          Generic PWM framework driver for the PWM output of the HLCDC
          (Atmel High-end LCD Controller). This PWM output is mainly used
@@ -130,6 +131,19 @@ config PWM_FSL_FTM
          To compile this driver as a module, choose M here: the module
          will be called pwm-fsl-ftm.
 
+config PWM_IMG
+       tristate "Imagination Technologies PWM driver"
+       depends on HAS_IOMEM
+       depends on MFD_SYSCON
+       depends on COMMON_CLK
+       depends on MIPS || COMPILE_TEST
+       help
+         Generic PWM framework driver for Imagination Technologies
+         PWM block which supports 4 channels.
+
+         To compile this driver as a module, choose M here: the module
+         will be called pwm-img
+
 config PWM_IMX
        tristate "i.MX PWM support"
        depends on ARCH_MXC
@@ -283,6 +297,16 @@ config PWM_STI
          To compile this driver as a module, choose M here: the module
          will be called pwm-sti.
 
+config PWM_SUN4I
+       tristate "Allwinner PWM support"
+       depends on ARCH_SUNXI || COMPILE_TEST
+       depends on HAS_IOMEM && COMMON_CLK
+       help
+         Generic PWM framework driver for Allwinner SoCs.
+
+         To compile this driver as a module, choose M here: the module
+         will be called pwm-sun4i.
+
 config PWM_TEGRA
        tristate "NVIDIA Tegra PWM support"
        depends on ARCH_TEGRA