Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88e75cc3 authored by David Brownell's avatar David Brownell Committed by Samuel Ortiz
Browse files

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: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarSamuel Ortiz <sameo@openedhand.com>
parent 87c13493

drivers/i2c/chips/Kconfig

+0 −10
Original line number Diff line number Diff line
@@ -151,16 +151,6 @@ config SENSORS_TSL2550 
	  This driver can also be built as a module.  If so, the module

	  will be called tsl2550.



config MENELAUS

	bool "TWL92330/Menelaus PM chip"

	depends on I2C=y && ARCH_OMAP24XX

	help

	  If you say yes here you get support for the Texas Instruments

	  TWL92330/Menelaus Power Management chip. This include voltage

	  regulators, Dual slot memory card tranceivers, real-time clock

	  and other features that are often used in portable devices like

	  cell phones and PDAs.



config MCU_MPC8349EMITX

	tristate "MPC8349E-mITX MCU driver"

	depends on I2C && PPC_83xx

drivers/i2c/chips/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ obj-$(CONFIG_SENSORS_PCF8574) += pcf8574.o 
obj-$(CONFIG_PCF8575)		+= pcf8575.o

obj-$(CONFIG_SENSORS_PCF8591)	+= pcf8591.o

obj-$(CONFIG_ISP1301_OMAP)	+= isp1301_omap.o

obj-$(CONFIG_MENELAUS)		+= menelaus.o

obj-$(CONFIG_SENSORS_TSL2550)	+= tsl2550.o

obj-$(CONFIG_MCU_MPC8349EMITX)	+= mcu_mpc8349emitx.o

drivers/mfd/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -82,6 +82,16 @@ config TPS65010 
	  This driver can also be built as a module.  If so, the module

	  will be called tps65010.



config MENELAUS

	bool "Texas Instruments TWL92330/Menelaus PM chip"

	depends on I2C=y && ARCH_OMAP24XX

	help

	  If you say yes here you get support for the Texas Instruments

	  TWL92330/Menelaus Power Management chip. This include voltage

	  regulators, Dual slot memory card tranceivers, real-time clock

	  and other features that are often used in portable devices like

	  cell phones and PDAs.



config TWL4030_CORE

	bool "Texas Instruments TWL4030/TPS659x0 Support"

	depends on I2C=y && GENERIC_HARDIRQS

drivers/mfd/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ obj-$(CONFIG_MFD_WM8350) += wm8350.o 
obj-$(CONFIG_MFD_WM8350_I2C)	+= wm8350-i2c.o



obj-$(CONFIG_TPS65010)		+= tps65010.o

obj-$(CONFIG_MENELAUS)		+= menelaus.o



obj-$(CONFIG_TWL4030_CORE)	+= twl4030-core.o twl4030-irq.o

drivers/i2c/chips/menelaus.c→drivers/mfd/menelaus.c

+0 −0

File moved.

View file