mfd: Using MFD_xx prefix for symbols
This patch provides rename MFD-related symbols for using MFD-prefix. Additionally, sorting mfd/Kconfig and mfd/Makefile records. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
parent
f3feb8d4ad
commit
bbc0b6bc15
|
@ -230,14 +230,14 @@ console_initcall(eukrea_cpuimx27_console_init);
|
||||||
|
|
||||||
static int eukrea_cpuimx27_late_init(void)
|
static int eukrea_cpuimx27_late_init(void)
|
||||||
{
|
{
|
||||||
#ifdef CONFIG_I2C_LP3972
|
#ifdef CONFIG_MFD_LP3972
|
||||||
struct i2c_client *client;
|
struct i2c_client *client;
|
||||||
u8 reg[1];
|
u8 reg[1];
|
||||||
#endif
|
#endif
|
||||||
console_flush();
|
console_flush();
|
||||||
imx27_add_fec(&fec_info);
|
imx27_add_fec(&fec_info);
|
||||||
|
|
||||||
#ifdef CONFIG_I2C_LP3972
|
#ifdef CONFIG_MFD_LP3972
|
||||||
client = lp3972_get_client();
|
client = lp3972_get_client();
|
||||||
if (!client)
|
if (!client)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
|
|
@ -59,8 +59,8 @@ CONFIG_BAUDRATE=115200
|
||||||
# CONFIG_SPI is not set
|
# CONFIG_SPI is not set
|
||||||
CONFIG_I2C=y
|
CONFIG_I2C=y
|
||||||
CONFIG_I2C_OMAP=y
|
CONFIG_I2C_OMAP=y
|
||||||
CONFIG_I2C_TWLCORE=y
|
CONFIG_MFD_TWLCORE=y
|
||||||
CONFIG_I2C_TWL6030=y
|
CONFIG_MFD_TWL6030=y
|
||||||
CONFIG_MCI=y
|
CONFIG_MCI=y
|
||||||
CONFIG_MCI_STARTUP=y
|
CONFIG_MCI_STARTUP=y
|
||||||
CONFIG_MCI_OMAP_HSMMC=y
|
CONFIG_MCI_OMAP_HSMMC=y
|
||||||
|
|
|
@ -45,7 +45,7 @@ CONFIG_DRIVER_NET_FEC_IMX=y
|
||||||
# CONFIG_SPI is not set
|
# CONFIG_SPI is not set
|
||||||
CONFIG_I2C=y
|
CONFIG_I2C=y
|
||||||
CONFIG_I2C_IMX=y
|
CONFIG_I2C_IMX=y
|
||||||
CONFIG_I2C_LP3972=y
|
CONFIG_MFD_LP3972=y
|
||||||
CONFIG_DRIVER_CFI=y
|
CONFIG_DRIVER_CFI=y
|
||||||
# CONFIG_DRIVER_CFI_AMD is not set
|
# CONFIG_DRIVER_CFI_AMD is not set
|
||||||
# CONFIG_DRIVER_CFI_BANK_WIDTH_1 is not set
|
# CONFIG_DRIVER_CFI_BANK_WIDTH_1 is not set
|
||||||
|
|
|
@ -80,7 +80,7 @@ CONFIG_USB_TWL4030=y
|
||||||
CONFIG_MCI=y
|
CONFIG_MCI=y
|
||||||
CONFIG_MCI_STARTUP=y
|
CONFIG_MCI_STARTUP=y
|
||||||
CONFIG_MCI_OMAP_HSMMC=y
|
CONFIG_MCI_OMAP_HSMMC=y
|
||||||
CONFIG_I2C_TWL4030=y
|
CONFIG_MFD_TWL4030=y
|
||||||
CONFIG_FS_TFTP=y
|
CONFIG_FS_TFTP=y
|
||||||
CONFIG_FS_NFS=y
|
CONFIG_FS_NFS=y
|
||||||
CONFIG_FS_FAT=y
|
CONFIG_FS_FAT=y
|
||||||
|
|
|
@ -64,7 +64,7 @@ CONFIG_USB=y
|
||||||
CONFIG_MCI=y
|
CONFIG_MCI=y
|
||||||
CONFIG_MCI_STARTUP=y
|
CONFIG_MCI_STARTUP=y
|
||||||
CONFIG_MCI_OMAP_HSMMC=y
|
CONFIG_MCI_OMAP_HSMMC=y
|
||||||
CONFIG_I2C_TWL6030=y
|
CONFIG_MFD_TWL6030=y
|
||||||
CONFIG_FS_TFTP=y
|
CONFIG_FS_TFTP=y
|
||||||
CONFIG_FS_FAT=y
|
CONFIG_FS_FAT=y
|
||||||
CONFIG_FS_FAT_WRITE=y
|
CONFIG_FS_FAT_WRITE=y
|
||||||
|
|
|
@ -247,7 +247,7 @@ config MACH_EUKREA_CPUIMX25
|
||||||
config MACH_FREESCALE_MX25_3STACK
|
config MACH_FREESCALE_MX25_3STACK
|
||||||
bool "Freescale MX25 3stack"
|
bool "Freescale MX25 3stack"
|
||||||
select I2C
|
select I2C
|
||||||
select I2C_MC34704
|
select MFD_MC34704
|
||||||
help
|
help
|
||||||
Say Y here if you are using the Freescale MX25 3stack board equipped
|
Say Y here if you are using the Freescale MX25 3stack board equipped
|
||||||
with a Freescale i.MX25 Processor
|
with a Freescale i.MX25 Processor
|
||||||
|
@ -354,7 +354,7 @@ config MACH_FREESCALE_MX35_3STACK
|
||||||
select I2C
|
select I2C
|
||||||
select I2C_IMX
|
select I2C_IMX
|
||||||
select MFD_MC13XXX
|
select MFD_MC13XXX
|
||||||
select I2C_MC9SDZ60
|
select MFD_MC9SDZ60
|
||||||
help
|
help
|
||||||
Say Y here if you are using the Freescale MX35 3stack board equipped
|
Say Y here if you are using the Freescale MX35 3stack board equipped
|
||||||
with a Freescale i.MX35 Processor
|
with a Freescale i.MX35 Processor
|
||||||
|
|
|
@ -28,6 +28,6 @@ obj-$(CONFIG_OMAP3_CLOCK_CONFIG) += omap3_clock.o
|
||||||
pbl-$(CONFIG_OMAP3_CLOCK_CONFIG) += omap3_clock.o
|
pbl-$(CONFIG_OMAP3_CLOCK_CONFIG) += omap3_clock.o
|
||||||
obj-$(CONFIG_OMAP_GPMC) += gpmc.o devices-gpmc-nand.o
|
obj-$(CONFIG_OMAP_GPMC) += gpmc.o devices-gpmc-nand.o
|
||||||
obj-$(CONFIG_SHELL_NONE) += xload.o
|
obj-$(CONFIG_SHELL_NONE) += xload.o
|
||||||
obj-$(CONFIG_I2C_TWL6030) += omap4_twl6030_mmc.o
|
obj-$(CONFIG_MFD_TWL6030) += omap4_twl6030_mmc.o
|
||||||
obj-$(CONFIG_OMAP4_USBBOOT) += omap4_rom_usb.o
|
obj-$(CONFIG_OMAP4_USBBOOT) += omap4_rom_usb.o
|
||||||
obj-y += gpio.o
|
obj-y += gpio.o
|
||||||
|
|
|
@ -17,7 +17,7 @@ config GPIO_PL061
|
||||||
Say yes here to support the PrimeCell PL061 GPIO device
|
Say yes here to support the PrimeCell PL061 GPIO device
|
||||||
|
|
||||||
config GPIO_STMPE
|
config GPIO_STMPE
|
||||||
depends on I2C_STMPE
|
depends on MFD_STMPE
|
||||||
bool "STMPE GPIO Expander"
|
bool "STMPE GPIO Expander"
|
||||||
endmenu
|
endmenu
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@ obj-$(CONFIG_MCI_S3C) += s3c.o
|
||||||
obj-$(CONFIG_MCI_IMX) += imx.o
|
obj-$(CONFIG_MCI_IMX) += imx.o
|
||||||
obj-$(CONFIG_MCI_IMX_ESDHC) += imx-esdhc.o
|
obj-$(CONFIG_MCI_IMX_ESDHC) += imx-esdhc.o
|
||||||
obj-$(CONFIG_MCI_OMAP_HSMMC) += omap_hsmmc.o
|
obj-$(CONFIG_MCI_OMAP_HSMMC) += omap_hsmmc.o
|
||||||
obj-$(CONFIG_I2C_TWL6030) += twl6030.o
|
obj-$(CONFIG_MFD_TWL6030) += twl6030.o
|
||||||
obj-$(CONFIG_MCI_PXA) += pxamci.o
|
obj-$(CONFIG_MCI_PXA) += pxamci.o
|
||||||
obj-$(CONFIG_MCI_ATMEL) += atmel_mci.o
|
obj-$(CONFIG_MCI_ATMEL) += atmel_mci.o
|
||||||
obj-$(CONFIG_MCI_SPI) += mci_spi.o
|
obj-$(CONFIG_MCI_SPI) += mci_spi.o
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
|
|
||||||
#include <mach/omap_hsmmc.h>
|
#include <mach/omap_hsmmc.h>
|
||||||
|
|
||||||
#if defined(CONFIG_I2C_TWL6030) && \
|
#if defined(CONFIG_MFD_TWL6030) && \
|
||||||
defined(CONFIG_MCI_OMAP_HSMMC) && \
|
defined(CONFIG_MCI_OMAP_HSMMC) && \
|
||||||
defined(CONFIG_ARCH_OMAP4)
|
defined(CONFIG_ARCH_OMAP4)
|
||||||
#include <mach/omap4_twl6030_mmc.h>
|
#include <mach/omap4_twl6030_mmc.h>
|
||||||
|
@ -235,7 +235,7 @@ static int mmc_init_setup(struct mci_host *mci, struct device_d *dev)
|
||||||
* It's necessary to do this here, because
|
* It's necessary to do this here, because
|
||||||
* you need to set up this at probetime.
|
* you need to set up this at probetime.
|
||||||
*/
|
*/
|
||||||
#if defined(CONFIG_I2C_TWL6030) && \
|
#if defined(CONFIG_MFD_TWL6030) && \
|
||||||
defined(CONFIG_MCI_OMAP_HSMMC) && \
|
defined(CONFIG_MCI_OMAP_HSMMC) && \
|
||||||
defined(CONFIG_ARCH_OMAP4)
|
defined(CONFIG_ARCH_OMAP4)
|
||||||
set_up_mmc_voltage_omap4();
|
set_up_mmc_voltage_omap4();
|
||||||
|
|
|
@ -1,10 +1,14 @@
|
||||||
menu MFD
|
menu MFD
|
||||||
|
|
||||||
|
config MFD_LP3972
|
||||||
|
depends on I2C
|
||||||
|
bool "LP3972 driver"
|
||||||
|
|
||||||
config MFD_MC13XXX
|
config MFD_MC13XXX
|
||||||
depends on I2C || SPI
|
depends on I2C || SPI
|
||||||
bool "MC13XXX a.k.a. PMIC driver (MC13783, MC13892)"
|
bool "MC13XXX a.k.a. PMIC driver (MC13783, MC13892)"
|
||||||
|
|
||||||
config I2C_MC34704
|
config MFD_MC34704
|
||||||
depends on I2C
|
depends on I2C
|
||||||
bool "MC34704 PMIC driver"
|
bool "MC34704 PMIC driver"
|
||||||
|
|
||||||
|
@ -12,29 +16,25 @@ config MFD_MC34708
|
||||||
depends on I2C || SPI
|
depends on I2C || SPI
|
||||||
bool "MC34708 PMIC driver"
|
bool "MC34708 PMIC driver"
|
||||||
|
|
||||||
config I2C_MC9SDZ60
|
config MFD_MC9SDZ60
|
||||||
depends on I2C
|
depends on I2C
|
||||||
bool "MC9SDZ60 driver"
|
bool "MC9SDZ60 driver"
|
||||||
|
|
||||||
config I2C_LP3972
|
config MFD_STMPE
|
||||||
depends on I2C
|
|
||||||
bool "LP3972 driver"
|
|
||||||
|
|
||||||
config I2C_TWLCORE
|
|
||||||
bool
|
|
||||||
|
|
||||||
config I2C_TWL4030
|
|
||||||
depends on I2C
|
|
||||||
select I2C_TWLCORE
|
|
||||||
bool "TWL4030 driver"
|
|
||||||
|
|
||||||
config I2C_TWL6030
|
|
||||||
depends on I2C
|
|
||||||
select I2C_TWLCORE
|
|
||||||
bool "TWL6030 driver"
|
|
||||||
|
|
||||||
config I2C_STMPE
|
|
||||||
depends on I2C
|
depends on I2C
|
||||||
bool "STMPE-i2c driver"
|
bool "STMPE-i2c driver"
|
||||||
|
|
||||||
|
config MFD_TWLCORE
|
||||||
|
bool
|
||||||
|
|
||||||
|
config MFD_TWL4030
|
||||||
|
depends on I2C
|
||||||
|
select MFD_TWLCORE
|
||||||
|
bool "TWL4030 driver"
|
||||||
|
|
||||||
|
config MFD_TWL6030
|
||||||
|
depends on I2C
|
||||||
|
select MFD_TWLCORE
|
||||||
|
bool "TWL6030 driver"
|
||||||
|
|
||||||
endmenu
|
endmenu
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
obj-$(CONFIG_MFD_MC13XXX) += mc13xxx.o
|
obj-$(CONFIG_MFD_LP3972) += lp3972.o
|
||||||
obj-$(CONFIG_I2C_MC34704) += mc34704.o
|
obj-$(CONFIG_MFD_MC13XXX) += mc13xxx.o
|
||||||
obj-$(CONFIG_MFD_MC34708) += mc34708.o
|
obj-$(CONFIG_MFD_MC34704) += mc34704.o
|
||||||
obj-$(CONFIG_I2C_MC9SDZ60) += mc9sdz60.o
|
obj-$(CONFIG_MFD_MC34708) += mc34708.o
|
||||||
obj-$(CONFIG_I2C_LP3972) += lp3972.o
|
obj-$(CONFIG_MFD_MC9SDZ60) += mc9sdz60.o
|
||||||
obj-$(CONFIG_I2C_TWLCORE) += twl-core.o
|
obj-$(CONFIG_MFD_STMPE) += stmpe-i2c.o
|
||||||
obj-$(CONFIG_I2C_TWL4030) += twl4030.o
|
obj-$(CONFIG_MFD_TWLCORE) += twl-core.o
|
||||||
obj-$(CONFIG_I2C_TWL6030) += twl6030.o
|
obj-$(CONFIG_MFD_TWL4030) += twl4030.o
|
||||||
obj-$(CONFIG_I2C_STMPE) += stmpe-i2c.o
|
obj-$(CONFIG_MFD_TWL6030) += twl6030.o
|
||||||
|
|
|
@ -4,5 +4,5 @@ config USB_ULPI
|
||||||
Support for transceivers that conforms ULPI specification.
|
Support for transceivers that conforms ULPI specification.
|
||||||
|
|
||||||
config USB_TWL4030
|
config USB_TWL4030
|
||||||
depends on I2C_TWL4030
|
depends on MFD_TWL4030
|
||||||
bool "TWL4030 Transceiver support"
|
bool "TWL4030 Transceiver support"
|
||||||
|
|
|
@ -10,8 +10,8 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef __I2C_MC34704_H
|
#ifndef __MFD_MC34704_H
|
||||||
#define __I2C_MC34704_H
|
#define __MFD_MC34704_H
|
||||||
|
|
||||||
struct mc34704 {
|
struct mc34704 {
|
||||||
struct cdev cdev;
|
struct cdev cdev;
|
||||||
|
@ -23,4 +23,4 @@ extern struct mc34704 *mc34704_get(void);
|
||||||
extern int mc34704_reg_read(struct mc34704 *mc34704, u8 reg, u8 *val);
|
extern int mc34704_reg_read(struct mc34704 *mc34704, u8 reg, u8 *val);
|
||||||
extern int mc34704_reg_write(struct mc34704 *mc34704, u8 reg, u8 val);
|
extern int mc34704_reg_write(struct mc34704 *mc34704, u8 reg, u8 val);
|
||||||
|
|
||||||
#endif /* __I2C_MC34704_H */
|
#endif /* __MFD_MC34704_H */
|
||||||
|
|
|
@ -9,8 +9,8 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef __I2C_TWLCORE_H__
|
#ifndef __MFD_TWLCORE_H__
|
||||||
#define __I2C_TWLCORE_H__
|
#define __MFD_TWLCORE_H__
|
||||||
|
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <i2c/i2c.h>
|
#include <i2c/i2c.h>
|
||||||
|
@ -27,4 +27,4 @@ extern int twlcore_reg_read(struct twlcore *twlcore, u16 reg, u8 *val);
|
||||||
extern int twlcore_reg_write(struct twlcore *twlcore, u16 reg, u8 val);
|
extern int twlcore_reg_write(struct twlcore *twlcore, u16 reg, u8 val);
|
||||||
extern int twlcore_set_bits(struct twlcore *twlcore, u16 reg, u8 mask, u8 val);
|
extern int twlcore_set_bits(struct twlcore *twlcore, u16 reg, u8 mask, u8 val);
|
||||||
|
|
||||||
#endif /* __I2C_TWLCORE_H__ */
|
#endif /* __MFD_TWLCORE_H__ */
|
||||||
|
|
|
@ -6,8 +6,8 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef __I2C_TWL4030_H__
|
#ifndef __MFD_TWL4030_H__
|
||||||
#define __I2C_TWL4030_H__
|
#define __MFD_TWL4030_H__
|
||||||
|
|
||||||
#include <mfd/twl-core.h>
|
#include <mfd/twl-core.h>
|
||||||
|
|
||||||
|
@ -469,4 +469,4 @@ static inline int twl4030_set_bits(struct twl4030 *twl4030,
|
||||||
return twlcore_set_bits(&(twl4030->core), reg, mask, val);
|
return twlcore_set_bits(&(twl4030->core), reg, mask, val);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* __I2C_TWL4030_H__ */
|
#endif /* __MFD_TWL4030_H__ */
|
||||||
|
|
|
@ -5,8 +5,8 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef __I2C_TWL6030_H__
|
#ifndef __MFD_TWL6030_H__
|
||||||
#define __I2C_TWL6030_H__
|
#define __MFD_TWL6030_H__
|
||||||
|
|
||||||
#include <mfd/twl-core.h>
|
#include <mfd/twl-core.h>
|
||||||
|
|
||||||
|
@ -424,4 +424,4 @@ static inline int twl6030_set_bits(struct twl6030 *twl6030,
|
||||||
return twlcore_set_bits(&twl6030->core, reg, mask, val);
|
return twlcore_set_bits(&twl6030->core, reg, mask, val);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* __I2C_TWL6030_H__ */
|
#endif /* __MFD_TWL6030_H__ */
|
||||||
|
|
Loading…
Reference in New Issue