diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-10-10 19:36:19 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-10-11 13:22:13 +0200 |
| commit | 2ebb440e1d92c60f47a0d89b7666f190caf38561 (patch) | |
| tree | 3e361fe34257ce37463dec5b6d129bc52258fb7b /drivers | |
| parent | 8f14d065e1e39d88949ee489acfe6f7faa51f1b1 (diff) | |
| download | barebox-2ebb440e1d92c60f47a0d89b7666f190caf38561.tar.gz barebox-2ebb440e1d92c60f47a0d89b7666f190caf38561.tar.xz | |
Move mfd drivers to drivers/mfd
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/Makefile | 1 | ||||
| -rw-r--r-- | drivers/i2c/Kconfig | 16 | ||||
| -rw-r--r-- | drivers/i2c/Makefile | 6 | ||||
| -rw-r--r-- | drivers/mfd/Kconfig | 28 | ||||
| -rw-r--r-- | drivers/mfd/Makefile | 6 | ||||
| -rw-r--r-- | drivers/mfd/lp3972.c (renamed from drivers/i2c/lp3972.c) | 0 | ||||
| -rw-r--r-- | drivers/mfd/mc13783.c (renamed from drivers/spi/mc13783.c) | 0 | ||||
| -rw-r--r-- | drivers/mfd/mc13892.c (renamed from drivers/i2c/mc13892.c) | 0 | ||||
| -rw-r--r-- | drivers/mfd/mc34704.c (renamed from drivers/i2c/mc34704.c) | 0 | ||||
| -rw-r--r-- | drivers/mfd/mc9sdz60.c (renamed from drivers/i2c/mc9sdz60.c) | 0 | ||||
| -rw-r--r-- | drivers/mfd/twl4030.c (renamed from drivers/i2c/twl4030.c) | 0 | ||||
| -rw-r--r-- | drivers/spi/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/spi/Makefile | 2 |
14 files changed, 36 insertions, 28 deletions
diff --git a/drivers/Kconfig b/drivers/Kconfig index 13235f35f5..d94017bfc1 100644 --- 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 diff --git a/drivers/Makefile b/drivers/Makefile index 71d34f969b..242a564dd7 100644 --- 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/ diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig index 9ce16558c4..c2af818393 100644 --- 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 diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile index 0584b5589d..42e22c01b0 100644 --- 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 diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig new file mode 100644 index 0000000000..7c27418bf1 --- /dev/null +++ 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 diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile new file mode 100644 index 0000000000..d411f23b69 --- /dev/null +++ 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 diff --git a/drivers/i2c/lp3972.c b/drivers/mfd/lp3972.c index 98266990dc..98266990dc 100644 --- a/drivers/i2c/lp3972.c +++ b/drivers/mfd/lp3972.c diff --git a/drivers/spi/mc13783.c b/drivers/mfd/mc13783.c index 19e2780920..19e2780920 100644 --- a/drivers/spi/mc13783.c +++ b/drivers/mfd/mc13783.c diff --git a/drivers/i2c/mc13892.c b/drivers/mfd/mc13892.c index 67d4232a23..67d4232a23 100644 --- a/drivers/i2c/mc13892.c +++ b/drivers/mfd/mc13892.c diff --git a/drivers/i2c/mc34704.c b/drivers/mfd/mc34704.c index 51a8737209..51a8737209 100644 --- a/drivers/i2c/mc34704.c +++ b/drivers/mfd/mc34704.c diff --git a/drivers/i2c/mc9sdz60.c b/drivers/mfd/mc9sdz60.c index 3580af8852..3580af8852 100644 --- a/drivers/i2c/mc9sdz60.c +++ b/drivers/mfd/mc9sdz60.c diff --git a/drivers/i2c/twl4030.c b/drivers/mfd/twl4030.c index 5305ec67e3..5305ec67e3 100644 --- a/drivers/i2c/twl4030.c +++ b/drivers/mfd/twl4030.c diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index 2b8d2f4f08..a88e179e5a 100644 --- 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 diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile index 81f2c6bc62..b2b2f6788f 100644 --- 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 |