move drivers/i2c/chips/menelaus.c to drivers/mfd
Subsystems (2)
PATCH 2/2 move drivers/i2c/chips/menelaus.c to drivers/mfd
From: David Brownell <[email protected]>
Move 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.
--- drivers/i2c/chips/Kconfig | 10 drivers/i2c/chips/Makefile | 1 drivers/i2c/chips/menelaus.c | 1285 ----------------------------------------- drivers/mfd/Kconfig | 10 drivers/mfd/Makefile | 1 drivers/mfd/menelaus.c | 1285 +++++++++++++++++++++++++++++++++++++++++ 6 files changed, 1296 insertions(+), 1296 deletions(-)
drivers/i2c/chips/Kconfig +0 -10
@@ -139,16 +139,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
@@ -18,7 +18,6 @@ obj-$(CONFIG_SENSORS_PCA9539) += pca9539 obj-$(CONFIG_SENSORS_PCF8574) += pcf8574.o obj-$(CONFIG_PCF8575) += pcf8575.o obj-$(CONFIG_SENSORS_PCF8591) += pcf8591.o -obj-$(CONFIG_MENELAUS) += menelaus.o obj-$(CONFIG_SENSORS_TSL2550) += tsl2550.o obj-$(CONFIG_MCU_MPC8349EMITX) += mcu_mpc8349emitx.o
drivers/i2c/chips/menelaus.c deleted +0 -1285
1,285 lines not on this page · raw message
drivers/mfd/Kconfig +10 -0
@@ -74,6 +74,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
@@ -18,6 +18,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/mfd/menelaus.c new file +1285 -0
1,285 lines not on this page · raw message
Hi David,
Quoted 10 lines · David Brownell
From: David Brownell <[email protected]>
Move the menelaus driver from
drivers/i2c/chipstodrivers/mfdsince it's more of a multi-function device than anything else, and since Jean is trying to vanishdrivers/i2c/chipsASAP.One way to think of these chips are as the PMIC family most used with OMAP2 generation chips.
Signed-off-by David Brownell <[email protected]>
Quoted 8 lines
--- drivers/i2c/chips/Kconfig | 10 drivers/i2c/chips/Makefile | 1 drivers/i2c/chips/menelaus.c | 1285 ----------------------------------------- drivers/mfd/Kconfig | 10 drivers/mfd/Makefile | 1 drivers/mfd/menelaus.c | 1285 +++++++++++++++++++++++++++++++++++++++++ 6 files changed, 1296 insertions(+), 1296 deletions(-)
I see that this patch and the tps65010 one have been applied already. Thank you for doing this!
Signature · 1 line
Jean Delvare