Commit 8a0a8e8e authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Samuel Ortiz
Browse files

mfd: remove CONFIG_MFD_SUPPORT 



We currently have two symbols to control compilation the MFD subsystem,
MFD_SUPPORT and MFD_CORE. The MFD_SUPPORT is actually not required
at all, it only hides the submenu when not set, with the effect that
Kconfig warns about missing dependencies when another driver selects
an MFD driver while MFD_SUPPORT is disabled. Turning the MFD submenu
back from menuconfig into a plain menu simplifies the Kconfig syntax
for those kinds of users and avoids the surprise when the menu
suddenly appears because another driver was enabled that selects this
symbol.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent b46880e5

arch/arm/mach-omap2/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ config ARCH_OMAP2PLUS_TYPICAL 
	select SERIAL_OMAP_CONSOLE

	select I2C

	select I2C_OMAP

	select MFD_SUPPORT

	select MENELAUS if ARCH_OMAP2

	select TWL4030_CORE if ARCH_OMAP3 || ARCH_OMAP4

	select TWL4030_POWER if ARCH_OMAP3 || ARCH_OMAP4

drivers/gpio/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ config GPIO_SCH 


config GPIO_VX855

	tristate "VIA VX855/VX875 GPIO"

	depends on MFD_SUPPORT && PCI

	depends on PCI

	select MFD_CORE

	select MFD_VX855

	help
@@ -417,7 +417,6 @@ config GPIO_TIMBERDALE 
config GPIO_RDC321X

	tristate "RDC R-321x GPIO support"

	depends on PCI

	select MFD_SUPPORT

	select MFD_CORE

	select MFD_RDC321X

	help

drivers/i2c/busses/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -110,7 +110,6 @@ config I2C_I801 
config I2C_ISCH

	tristate "Intel SCH SMBus 1.0"

	depends on PCI

	select MFD_CORE

	select LPC_SCH

	help

	  Say Y here if you want to use SMBus controller on the Intel SCH

drivers/media/radio/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -426,7 +426,6 @@ config RADIO_TIMBERDALE 
config RADIO_WL1273

	tristate "Texas Instruments WL1273 I2C FM Radio"

	depends on I2C && VIDEO_V4L2

	select MFD_CORE

	select MFD_WL1273_CORE

	select FW_LOADER

	---help---

drivers/mfd/Kconfig

+4 −18
Original line number Diff line number Diff line
@@ -2,23 +2,8 @@ 
# Multifunction miscellaneous devices

#



menuconfig MFD_SUPPORT

	bool "Multifunction device drivers"

	depends on HAS_IOMEM

	default y

	help

	  Multifunction devices embed several functions (e.g. GPIOs,

	  touchscreens, keyboards, current regulators, power management chips,

	  etc...) in one single integrated circuit. They usually talk to the

	  main CPU through one or more IRQ lines and low speed data busses (SPI,

	  I2C, etc..). They appear as one single device to the main system

	  through the data bus and the MFD framework allows for sub devices

	  (a.k.a. functions) to appear as discrete platform devices.

	  MFDs are typically found on embedded platforms.



	  This option alone does not add any kernel code.



if MFD_SUPPORT

if HAS_IOMEM

menu "Multifunction device drivers"



config MFD_CORE

	tristate
@@ -772,7 +757,8 @@ config MFD_AAT2870_CORE 
	  additional drivers must be enabled in order to use the

	  functionality of the device.



endif # MFD_SUPPORT

endmenu

endif



menu "Multimedia Capabilities Port drivers"

	depends on ARCH_SA1100

CRA Git | Maintained and supported by SUSTech CRA and CCSE