mfd: move drivers/i2c/chips/menelaus.c to drivers/mfd

ove the menelaus driver from drivers/i2c/chips to drivers/mfd
since it's more of a multi-function device than anything else,
and since Jean is trying to vanish drivers/i2c/chips ASAP.

One way to think of these chips are as the PMIC family most
used with OMAP2 generation chips.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Samuel Ortiz <sameo@openedhand.com>

authored by

David Brownell and committed by
Samuel Ortiz
88e75cc3 87c13493

+11 -11
-10
drivers/i2c/chips/Kconfig
··· 151 151 This driver can also be built as a module. If so, the module 152 152 will be called tsl2550. 153 153 154 - config MENELAUS 155 - bool "TWL92330/Menelaus PM chip" 156 - depends on I2C=y && ARCH_OMAP24XX 157 - help 158 - If you say yes here you get support for the Texas Instruments 159 - TWL92330/Menelaus Power Management chip. This include voltage 160 - regulators, Dual slot memory card tranceivers, real-time clock 161 - and other features that are often used in portable devices like 162 - cell phones and PDAs. 163 - 164 154 config MCU_MPC8349EMITX 165 155 tristate "MPC8349E-mITX MCU driver" 166 156 depends on I2C && PPC_83xx
-1
drivers/i2c/chips/Makefile
··· 19 19 obj-$(CONFIG_PCF8575) += pcf8575.o 20 20 obj-$(CONFIG_SENSORS_PCF8591) += pcf8591.o 21 21 obj-$(CONFIG_ISP1301_OMAP) += isp1301_omap.o 22 - obj-$(CONFIG_MENELAUS) += menelaus.o 23 22 obj-$(CONFIG_SENSORS_TSL2550) += tsl2550.o 24 23 obj-$(CONFIG_MCU_MPC8349EMITX) += mcu_mpc8349emitx.o 25 24
drivers/i2c/chips/menelaus.c drivers/mfd/menelaus.c
+10
drivers/mfd/Kconfig
··· 82 82 This driver can also be built as a module. If so, the module 83 83 will be called tps65010. 84 84 85 + config MENELAUS 86 + bool "Texas Instruments TWL92330/Menelaus PM chip" 87 + depends on I2C=y && ARCH_OMAP24XX 88 + help 89 + If you say yes here you get support for the Texas Instruments 90 + TWL92330/Menelaus Power Management chip. This include voltage 91 + regulators, Dual slot memory card tranceivers, real-time clock 92 + and other features that are often used in portable devices like 93 + cell phones and PDAs. 94 + 85 95 config TWL4030_CORE 86 96 bool "Texas Instruments TWL4030/TPS659x0 Support" 87 97 depends on I2C=y && GENERIC_HARDIRQS
+1
drivers/mfd/Makefile
··· 20 20 obj-$(CONFIG_MFD_WM8350_I2C) += wm8350-i2c.o 21 21 22 22 obj-$(CONFIG_TPS65010) += tps65010.o 23 + obj-$(CONFIG_MENELAUS) += menelaus.o 23 24 24 25 obj-$(CONFIG_TWL4030_CORE) += twl4030-core.o twl4030-irq.o 25 26