Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eac7a92f authored Jul 02, 2012 by Thierry Reding

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>

parent 1112fe88

drivers/mfd/Kconfig

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -276,6 +276,7 @@ config TWL6030_PWM
	tristate "TWL6030 PWM (Pulse Width Modulator) Support"		tristate "TWL6030 PWM (Pulse Width Modulator) Support"
	depends on TWL4030_CORE		depends on TWL4030_CORE
	select HAVE_PWM		select HAVE_PWM
			depends on !PWM
	default n		default n
	help		help
	Say yes here if you want support for TWL6030 PWM.		Say yes here if you want support for TWL6030 PWM.

drivers/misc/Kconfig

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -64,6 +64,7 @@ config AB8500_PWM
	bool "AB8500 PWM support"		bool "AB8500 PWM support"
	depends on AB8500_CORE && ARCH_U8500		depends on AB8500_CORE && ARCH_U8500
	select HAVE_PWM		select HAVE_PWM
			depends on !PWM
	help		help
	This driver exports functions to enable/disble/config/free Pulse		This driver exports functions to enable/disble/config/free Pulse
	Width Modulation in the Analog Baseband Chip AB8500.		Width Modulation in the Analog Baseband Chip AB8500.

drivers/pwm/Kconfig

+1 −0

Original line number	Original line	Diff line number	Diff line
	menuconfig PWM		menuconfig PWM
	bool "PWM Support"		bool "PWM Support"
			depends on !MACH_JZ4740 && !PUV3_PWM
	help		help
	This enables PWM support through the generic PWM framework.		This enables PWM support through the generic PWM framework.
	You only need to enable this, if you also want to enable		You only need to enable this, if you also want to enable