mfd: Using MFD_xx prefix for symbols

This patch provides rename MFD-related symbols for using MFD-prefix.
Additionally, sorting mfd/Kconfig and mfd/Makefile records.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

6 files changed, 27 insertions, 27 deletions

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 89be6843ae..5500ad1121 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -17,7 +17,7 @@ config GPIO_PL061
 	  Say yes here to support the PrimeCell PL061 GPIO device
 
 config GPIO_STMPE
-	depends on I2C_STMPE
+	depends on MFD_STMPE
 	bool "STMPE GPIO Expander"
 endmenu
 
diff --git a/drivers/mci/Makefile b/drivers/mci/Makefile
index b7bb846291..d46d5f50e8 100644
--- a/drivers/mci/Makefile
+++ b/drivers/mci/Makefile
@@ -4,7 +4,7 @@ obj-$(CONFIG_MCI_S3C) += s3c.o
 obj-$(CONFIG_MCI_IMX) += imx.o
 obj-$(CONFIG_MCI_IMX_ESDHC) += imx-esdhc.o
 obj-$(CONFIG_MCI_OMAP_HSMMC) += omap_hsmmc.o
-obj-$(CONFIG_I2C_TWL6030) += twl6030.o
+obj-$(CONFIG_MFD_TWL6030) += twl6030.o
 obj-$(CONFIG_MCI_PXA) += pxamci.o
 obj-$(CONFIG_MCI_ATMEL) += atmel_mci.o
 obj-$(CONFIG_MCI_SPI) += mci_spi.o
diff --git a/drivers/mci/omap_hsmmc.c b/drivers/mci/omap_hsmmc.c
index 336745de99..b379c31fae 100644
--- a/drivers/mci/omap_hsmmc.c
+++ b/drivers/mci/omap_hsmmc.c
@@ -29,7 +29,7 @@
 
 #include <mach/omap_hsmmc.h>
 
-#if defined(CONFIG_I2C_TWL6030) && \
+#if defined(CONFIG_MFD_TWL6030) && \
 	defined(CONFIG_MCI_OMAP_HSMMC) && \
 	defined(CONFIG_ARCH_OMAP4)
 #include <mach/omap4_twl6030_mmc.h>
@@ -235,7 +235,7 @@ static int mmc_init_setup(struct mci_host *mci, struct device_d *dev)
  * It's necessary to do this here, because
  * you need to set up this at probetime.
  */
-#if defined(CONFIG_I2C_TWL6030) && \
+#if defined(CONFIG_MFD_TWL6030) && \
 	defined(CONFIG_MCI_OMAP_HSMMC) && \
 	defined(CONFIG_ARCH_OMAP4)
 	set_up_mmc_voltage_omap4();
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index a253de3806..c506d6782b 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -1,10 +1,14 @@
 menu MFD
 
+config MFD_LP3972
+	depends on I2C
+	bool "LP3972 driver"
+
 config MFD_MC13XXX
 	depends on I2C || SPI
 	bool "MC13XXX a.k.a. PMIC driver (MC13783, MC13892)"
 
-config I2C_MC34704
+config MFD_MC34704
 	depends on I2C
 	bool "MC34704 PMIC driver"
 
@@ -12,29 +16,25 @@ config MFD_MC34708
 	depends on I2C || SPI
 	bool "MC34708 PMIC driver"
 
-config I2C_MC9SDZ60
+config MFD_MC9SDZ60
 	depends on I2C
 	bool "MC9SDZ60 driver"
 
-config I2C_LP3972
+config MFD_STMPE
 	depends on I2C
-	bool "LP3972 driver"
+	bool "STMPE-i2c driver"
 
-config I2C_TWLCORE
+config MFD_TWLCORE
 	bool
 
-config I2C_TWL4030
+config MFD_TWL4030
 	depends on I2C
-	select I2C_TWLCORE
+	select MFD_TWLCORE
 	bool "TWL4030 driver"
 
-config I2C_TWL6030
+config MFD_TWL6030
 	depends on I2C
-	select I2C_TWLCORE
+	select MFD_TWLCORE
 	bool "TWL6030 driver"
 
-config I2C_STMPE
-	depends on I2C
-	bool "STMPE-i2c driver"
-
 endmenu
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index a242eaf677..542fb0fb3a 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -1,9 +1,9 @@
-obj-$(CONFIG_MFD_MC13XXX) += mc13xxx.o
-obj-$(CONFIG_I2C_MC34704) += mc34704.o
-obj-$(CONFIG_MFD_MC34708) += mc34708.o
-obj-$(CONFIG_I2C_MC9SDZ60) += mc9sdz60.o
-obj-$(CONFIG_I2C_LP3972) += lp3972.o
-obj-$(CONFIG_I2C_TWLCORE) += twl-core.o
-obj-$(CONFIG_I2C_TWL4030) += twl4030.o
-obj-$(CONFIG_I2C_TWL6030) += twl6030.o
-obj-$(CONFIG_I2C_STMPE) += stmpe-i2c.o
+obj-$(CONFIG_MFD_LP3972)	+= lp3972.o
+obj-$(CONFIG_MFD_MC13XXX)	+= mc13xxx.o
+obj-$(CONFIG_MFD_MC34704)	+= mc34704.o
+obj-$(CONFIG_MFD_MC34708)	+= mc34708.o
+obj-$(CONFIG_MFD_MC9SDZ60)	+= mc9sdz60.o
+obj-$(CONFIG_MFD_STMPE)		+= stmpe-i2c.o
+obj-$(CONFIG_MFD_TWLCORE)	+= twl-core.o
+obj-$(CONFIG_MFD_TWL4030)	+= twl4030.o
+obj-$(CONFIG_MFD_TWL6030)	+= twl6030.o
diff --git a/drivers/usb/otg/Kconfig b/drivers/usb/otg/Kconfig
index 892c21ebee..2c9fb46e4d 100644
--- a/drivers/usb/otg/Kconfig
+++ b/drivers/usb/otg/Kconfig
@@ -4,5 +4,5 @@ config USB_ULPI
 	  Support for transceivers that conforms ULPI specification.
 
 config USB_TWL4030
-	depends on I2C_TWL4030
+	depends on MFD_TWL4030
 	bool "TWL4030 Transceiver support"