Move mfd drivers to drivers/mfd

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-10-10 19:36:19 +02:00 · 2010-10-10 19:36:19 +02:00 · 2ebb440e1d
parent 8f14d065e1
commit 2ebb440e1d
14 changed files with 36 additions and 28 deletions
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@ -11,5 +11,6 @@ source "drivers/usb/Kconfig"
 source "drivers/video/Kconfig"
 source "drivers/mci/Kconfig"
 source "drivers/clk/Kconfig"
+source "drivers/mfd/Kconfig"

 endmenu
--- a/drivers/Makefile
+++ b/drivers/Makefile
@ -9,3 +9,4 @@ obj-$(CONFIG_I2C) += i2c/
 obj-$(CONFIG_MCI) += mci/
 obj-$(CONFIG_VIDEO) += video/
 obj-y	+= clk/
+obj-y	+= mfd/
--- a/drivers/i2c/Kconfig
+++ b/drivers/i2c/Kconfig
@ -5,20 +5,4 @@ if I2C

 source drivers/i2c/busses/Kconfig

-config I2C_MC13892
-	bool "MC13892 a.k.a. PMIC driver"
-
-config I2C_MC34704
-	bool "MC34704 PMIC driver"
-
-config I2C_MC9SDZ60
-	bool "MC9SDZ60 driver"
-
-config I2C_LP3972
-	bool "LP3972 driver"
-
-config I2C_TWL4030
-	bool "TWL4030 driver"
-	select GPIO
-
 endif
--- a/drivers/i2c/Makefile
+++ b/drivers/i2c/Makefile
@ -1,7 +1 @@
 obj-$(CONFIG_I2C) += i2c.o busses/
-
-obj-$(CONFIG_I2C_MC13892) += mc13892.o
-obj-$(CONFIG_I2C_MC34704) += mc34704.o
-obj-$(CONFIG_I2C_MC9SDZ60) += mc9sdz60.o
-obj-$(CONFIG_I2C_LP3972) += lp3972.o
-obj-$(CONFIG_I2C_TWL4030) += twl4030.o
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@ -0,0 +1,28 @@
+menu MFD
+
+config I2C_MC13892
+	depends on I2C
+	bool "MC13892 a.k.a. PMIC driver"
+
+config I2C_MC34704
+	depends on I2C
+	bool "MC34704 PMIC driver"
+
+config I2C_MC9SDZ60
+	depends on I2C
+	bool "MC9SDZ60 driver"
+
+config I2C_LP3972
+	depends on I2C
+	bool "LP3972 driver"
+
+config I2C_TWL4030
+	depends on I2C
+	bool "TWL4030 driver"
+	select GPIO
+
+config DRIVER_SPI_MC13783
+	depends on SPI
+	bool "MC13783 a.k.a. PMIC driver"
+
+endmenu
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@ -0,0 +1,6 @@
+obj-$(CONFIG_I2C_MC13892) += mc13892.o
+obj-$(CONFIG_I2C_MC34704) += mc34704.o
+obj-$(CONFIG_I2C_MC9SDZ60) += mc9sdz60.o
+obj-$(CONFIG_I2C_LP3972) += lp3972.o
+obj-$(CONFIG_I2C_TWL4030) += twl4030.o
+obj-$(CONFIG_DRIVER_SPI_MC13783) += mc13783.o
--- a/drivers/mfd/lp3972.c
+++ b/drivers/mfd/lp3972.c
--- a/drivers/mfd/mc13783.c
+++ b/drivers/mfd/mc13783.c
--- a/drivers/mfd/mc13892.c
+++ b/drivers/mfd/mc13892.c
--- a/drivers/mfd/mc34704.c
+++ b/drivers/mfd/mc34704.c
--- a/drivers/mfd/mc9sdz60.c
+++ b/drivers/mfd/mc9sdz60.c
--- a/drivers/mfd/twl4030.c
+++ b/drivers/mfd/twl4030.c
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@ -19,8 +19,4 @@ config DRIVER_SPI_IMX_2_3
 	depends on ARCH_IMX51
 	default y

-config DRIVER_SPI_MC13783
-	bool "MC13783 a.k.a. PMIC driver"
-	depends on SPI
-
 endmenu
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@ -1,4 +1,2 @@
 obj-$(CONFIG_SPI) += spi.o
 obj-$(CONFIG_DRIVER_SPI_IMX) += imx_spi.o
-
-obj-$(CONFIG_DRIVER_SPI_MC13783) += mc13783.o