pwm: Conflict with legacy PWM API

In order to avoid duplicate symbols with legacy PWM API implementations,
the new PWM framework needs to conflict with any of the existing legacy
implementations. This is done in two ways: for implementations provided
by drivers, a conflict is added to the driver to ensure it will have to
be ported to the PWM subsystem before it can coexist with other PWM
providers. For architecture-specific code, the conflict is added to the
PWM symbol to avoid confusion when a previously picked platform or
machine can no longer be selected because of the PWM subsystem being
included.

Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index e129c820df7da7d6430e62891558f92cdbe235ab..19c7f38099638ef5ae1197ac2ccf4ba2e99c00ce 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -276,6 +276,7 @@ config TWL6030_PWM
        tristate "TWL6030 PWM (Pulse Width Modulator) Support"
        depends on TWL4030_CORE
        select HAVE_PWM
+       depends on !PWM
        default n
        help
          Say yes here if you want support for TWL6030 PWM.

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 2661f6e366f9c70ed1b3534005260cc650200f3a..731ed8504a649eaeab4db8acd1902d3cb58df7c0 100644 (file)
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -64,6 +64,7 @@ config AB8500_PWM
        bool "AB8500 PWM support"
        depends on AB8500_CORE && ARCH_U8500
        select HAVE_PWM
+       depends on !PWM
        help
          This driver exports functions to enable/disble/config/free Pulse
          Width Modulation in the Analog Baseband Chip AB8500.

diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig
index 5227415f18554addbe36892a2b13595608df8ced..0b2800fc1ca7dadb709ce46238886a5c2bf4427d 100644 (file)
--- a/drivers/pwm/Kconfig
+++ b/drivers/pwm/Kconfig
@@ -1,5 +1,6 @@
 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