redonkable
/
remarkable-uboot
1
0
Fork 0
Code Releases Activity

mmc: replace CONFIG_GENERIC_MMC with CONFIG_MMC 

Now CONFIG_GENERIC_MMC and CONFIG_MMC match for all defconfig.
We do not need two options for the same feature.  Deprecate the
former.

This commit was generated with the sed script 's/GENERIC_MMC/MMC/'
and manual fixup of drivers/mmc/Kconfig.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
zero-sugar
Masahiro Yamada 2017-05-09 20:31:39 +09:00 committed by Jaehoon Chung
parent 67e09e248f
commit 4aa2ba3a34
40 changed files with 55 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/Kconfig
View File

@ -654,7 +654,7 @@ config ARCH_SUNXI
imply SPL_LIBCOMMON_SUPPORT
imply SPL_LIBDISK_SUPPORT
imply SPL_LIBGENERIC_SUPPORT
imply SPL_MMC_SUPPORT if GENERIC_MMC
imply SPL_MMC_SUPPORT if MMC
imply SPL_POWER_SUPPORT
imply SPL_SERIAL_SUPPORT

2
board/BuR/common/common.c
View File

@ -684,7 +684,7 @@ int board_eth_init(bd_t *bis)
return rv;
}
#endif /* defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD) */
#if defined(CONFIG_GENERIC_MMC)
#if defined(CONFIG_MMC)
int board_mmc_init(bd_t *bis)
{
return omap_mmc_init(1, 0, 0, -1, -1);

2
board/bosch/shc/board.c
View File

@ -632,7 +632,7 @@ void arch_preboot_os(void)
leds_set_finish();
}
#if defined(CONFIG_GENERIC_MMC)
#if defined(CONFIG_MMC)
int board_mmc_init(bd_t *bis)
{
int ret;

4
board/compulab/cl-som-am57x/cl-som-am57x.c
View File

@ -33,7 +33,7 @@ int board_init(void)
return 0;
}
#ifdef CONFIG_GENERIC_MMC
#ifdef CONFIG_MMC
#define SB_SOM_CD_GPIO 187
#define SB_SOM_WP_GPIO 188
@ -51,7 +51,7 @@ int board_mmc_init(bd_t *bis)
return ret0 && ret1;
}
#endif /* CONFIG_GENERIC_MMC */
#endif /* CONFIG_MMC */
int misc_init_r(void)
{

4
board/compulab/cm_t35/cm_t35.c
View File

@ -372,7 +372,7 @@ void set_muxconf_regs(void)
cm_t3730_set_muxconf();
}
#if defined(CONFIG_GENERIC_MMC)
#if defined(CONFIG_MMC)
#define SB_T35_WP_GPIO 59
int board_mmc_getcd(struct mmc *mmc)
@ -391,7 +391,7 @@ int board_mmc_init(bd_t *bis)
}
#endif
#if defined(CONFIG_GENERIC_MMC)
#if defined(CONFIG_MMC)
void board_mmc_power_init(void)
{
twl4030_power_mmc_init(0);

2
board/compulab/cm_t3517/cm_t3517.c
View File

@ -115,7 +115,7 @@ int misc_init_r(void)
return 0;
}
#if defined(CONFIG_GENERIC_MMC)
#if defined(CONFIG_MMC)
#define SB_T35_CD_GPIO 144
#define SB_T35_WP_GPIO 59

2
board/compulab/cm_t54/cm_t54.c
View File

@ -96,7 +96,7 @@ uint mmc_get_env_part(struct mmc *mmc)
}
#endif
#if defined(CONFIG_GENERIC_MMC)
#if defined(CONFIG_MMC)
#define SB_T54_CD_GPIO 228
#define SB_T54_WP_GPIO 229

4
board/corscience/tricorder/tricorder.c
View File

@ -140,14 +140,14 @@ void set_muxconf_regs(void)
MUX_TRICORDER();
}
#if defined(CONFIG_GENERIC_MMC)
#if defined(CONFIG_MMC)
int board_mmc_init(bd_t *bis)
{
return omap_mmc_init(0, 0, 0, -1, -1);
}
#endif
#if defined(CONFIG_GENERIC_MMC)
#if defined(CONFIG_MMC)
void board_mmc_power_init(void)
{
twl4030_power_mmc_init(0);

2
board/gumstix/duovero/duovero.c
View File

@ -110,7 +110,7 @@ void set_muxconf_regs(void)
sizeof(struct pad_conf_entry));
}
#if defined(CONFIG_GENERIC_MMC)
#if defined(CONFIG_MMC)
int board_mmc_init(bd_t *bis)
{
return omap_mmc_init(0, 0, 0, -1, -1);

2
board/hisilicon/hikey/hikey.c
View File

@ -341,7 +341,7 @@ int board_init(void)
return 0;
}
#ifdef CONFIG_GENERIC_MMC
#ifdef CONFIG_MMC
static int init_dwmmc(void)
{

4
board/isee/igep00x0/igep00x0.c
View File

@ -199,14 +199,14 @@ int board_eth_init(bd_t *bis)
static inline void setup_net_chip(void) {}
#endif
#if defined(CONFIG_GENERIC_MMC)
#if defined(CONFIG_MMC)
int board_mmc_init(bd_t *bis)
{
return omap_mmc_init(0, 0, 0, -1, -1);
}
#endif
#if defined(CONFIG_GENERIC_MMC)
#if defined(CONFIG_MMC)
void board_mmc_power_init(void)
{
twl4030_power_mmc_init(0);

2
board/logicpd/am3517evm/am3517evm.c
View File

@ -152,7 +152,7 @@ void set_muxconf_regs(void)
MUX_AM3517EVM();
}
#if defined(CONFIG_GENERIC_MMC)
#if defined(CONFIG_MMC)
int board_mmc_init(bd_t *bis)
{
return omap_mmc_init(0, 0, 0, -1, -1);

4
board/logicpd/omap3som/omap3logic.c
View File

@ -229,14 +229,14 @@ int board_late_init(void)
}
#endif
#if defined(CONFIG_GENERIC_MMC)
#if defined(CONFIG_MMC)
int board_mmc_init(bd_t *bis)
{
return omap_mmc_init(0, 0, 0, -1, -1);
}
#endif
#if defined(CONFIG_GENERIC_MMC)
#if defined(CONFIG_MMC)
void board_mmc_power_init(void)
{
twl4030_power_mmc_init(0);

2
board/logicpd/zoom1/zoom1.c
View File

@ -106,7 +106,7 @@ void set_muxconf_regs(void)
MUX_ZOOM1_MDK();
}
#ifdef CONFIG_GENERIC_MMC
#ifdef CONFIG_MMC
int board_mmc_init(bd_t *bis)
{
return omap_mmc_init(0, 0, 0, -1, -1);

4
board/overo/overo.c
View File

@ -379,14 +379,14 @@ int board_eth_init(bd_t *bis)
}
#endif
#if defined(CONFIG_GENERIC_MMC)
#if defined(CONFIG_MMC)
int board_mmc_init(bd_t *bis)
{
return omap_mmc_init(0, 0, 0, -1, -1);
}
#endif
#if defined(CONFIG_GENERIC_MMC)
#if defined(CONFIG_MMC)
void board_mmc_power_init(void)
{
twl4030_power_mmc_init(0);

2
board/pandora/pandora.c
View File

@ -121,7 +121,7 @@ void set_muxconf_regs(void)
}
}
#ifdef CONFIG_GENERIC_MMC
#ifdef CONFIG_MMC
int board_mmc_init(bd_t *bis)
{
return omap_mmc_init(0, 0, 0, -1, -1);

2
board/quipos/cairo/cairo.c
View File

@ -62,7 +62,7 @@ void set_muxconf_regs(void)
MUX_CAIRO();
}
#if defined(CONFIG_GENERIC_MMC)
#if defined(CONFIG_MMC)
int board_mmc_init(bd_t *bis)
{
return omap_mmc_init(0, 0, 0, -1, -1);

2
board/samsung/arndale/arndale.c
View File

@ -71,7 +71,7 @@ int dram_init_banksize(void)
return 0;
}
#ifdef CONFIG_GENERIC_MMC
#ifdef CONFIG_MMC
int board_mmc_init(bd_t *bis)
{
int ret;

2
board/samsung/common/board.c
View File

@ -250,7 +250,7 @@ int board_eth_init(bd_t *bis)
return 0;
}
#ifdef CONFIG_GENERIC_MMC
#ifdef CONFIG_MMC
static int init_mmc(void)
{
#ifdef CONFIG_MMC_SDHCI

4
board/samsung/common/misc.c
View File

@ -208,7 +208,7 @@ mode_cmd[BOOT_MODE_EXIT + 1] = {
static void display_board_info(void)
{
#ifdef CONFIG_GENERIC_MMC
#ifdef CONFIG_MMC
struct mmc *mmc = find_mmc_device(0);
#endif
vidinfo_t *vid = &panel_info;
@ -226,7 +226,7 @@ static void display_board_info(void)
lcd_printf("\tDRAM banks: %u\n", CONFIG_NR_DRAM_BANKS);
lcd_printf("\tDRAM size: %u MB\n", gd->ram_size / SZ_1M);
#ifdef CONFIG_GENERIC_MMC
#ifdef CONFIG_MMC
if (mmc) {
if (!mmc->capacity)
mmc_init(mmc);

2
board/samsung/goni/goni.c
View File

@ -72,7 +72,7 @@ int checkboard(void)
}
#endif
#ifdef CONFIG_GENERIC_MMC
#ifdef CONFIG_MMC
int board_mmc_init(bd_t *bis)
{
int i, ret, ret_sd = 0;

2
board/samsung/smdkv310/smdkv310.c
View File

@ -87,7 +87,7 @@ int checkboard(void)
}
#endif
#ifdef CONFIG_GENERIC_MMC
#ifdef CONFIG_MMC
int board_mmc_init(bd_t *bis)
{
int i, err;

2
board/sunxi/board.c
View File

@ -284,7 +284,7 @@ void board_nand_init(void)
}
#endif
#ifdef CONFIG_GENERIC_MMC
#ifdef CONFIG_MMC
static void mmc_pinmux_setup(int sdc)
{
unsigned int pin;

4
board/technexion/tao3530/tao3530.c
View File

@ -179,7 +179,7 @@ void set_muxconf_regs(void)
#endif
}
#if defined(CONFIG_GENERIC_MMC)
#if defined(CONFIG_MMC)
int board_mmc_init(bd_t *bis)
{
omap_mmc_init(0, 0, 0, -1, -1);
@ -188,7 +188,7 @@ int board_mmc_init(bd_t *bis)
}
#endif
#if defined(CONFIG_GENERIC_MMC)
#if defined(CONFIG_MMC)
void board_mmc_power_init(void)
{
twl4030_power_mmc_init(0);

2
board/ti/am3517crane/am3517crane.c
View File

@ -63,7 +63,7 @@ void set_muxconf_regs(void)
MUX_AM3517CRANE();
}
#if defined(CONFIG_GENERIC_MMC)
#if defined(CONFIG_MMC)
int board_mmc_init(bd_t *bis)
{
return omap_mmc_init(0, 0, 0, -1, -1);

2
board/ti/am57xx/board.c
View File

@ -661,7 +661,7 @@ err:
}
#endif
#if defined(CONFIG_GENERIC_MMC)
#if defined(CONFIG_MMC)
int board_mmc_init(bd_t *bis)
{
omap_mmc_init(0, 0, 0, -1, -1);

4
board/ti/beagle/beagle.c
View File

@ -524,14 +524,14 @@ void set_muxconf_regs(void)
MUX_BEAGLE();
}
#if defined(CONFIG_GENERIC_MMC)
#if defined(CONFIG_MMC)
int board_mmc_init(bd_t *bis)
{
return omap_mmc_init(0, 0, 0, -1, -1);
}
#endif
#if defined(CONFIG_GENERIC_MMC)
#if defined(CONFIG_MMC)
void board_mmc_power_init(void)
{
twl4030_power_mmc_init(0);

2
board/ti/dra7xx/evm.c
View File

@ -702,7 +702,7 @@ err:
}
#endif
#if defined(CONFIG_GENERIC_MMC)
#if defined(CONFIG_MMC)
int board_mmc_init(bd_t *bis)
{
omap_mmc_init(0, 0, 0, -1, -1);

4
board/ti/evm/evm.c
View File

@ -259,14 +259,14 @@ int board_eth_init(bd_t *bis)
}
#endif /* CONFIG_CMD_NET */
#if defined(CONFIG_GENERIC_MMC)
#if defined(CONFIG_MMC)
int board_mmc_init(bd_t *bis)
{
return omap_mmc_init(0, 0, 0, -1, -1);
}
#endif
#if defined(CONFIG_GENERIC_MMC)
#if defined(CONFIG_MMC)
void board_mmc_power_init(void)
{
twl4030_power_mmc_init(0);

2
board/ti/ks2_evm/board_k2g.c
View File

@ -196,7 +196,7 @@ s16 divn_val[16] = {
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
};
#if defined(CONFIG_GENERIC_MMC)
#if defined(CONFIG_MMC)
int board_mmc_init(bd_t *bis)
{
if (psc_enable_module(KS2_LPSC_MMC)) {

2
board/ti/omap5_uevm/evm.c
View File

@ -211,7 +211,7 @@ void set_muxconf_regs(void)
sizeof(struct pad_conf_entry));
}
#if defined(CONFIG_GENERIC_MMC)
#if defined(CONFIG_MMC)
int board_mmc_init(bd_t *bis)
{
omap_mmc_init(0, 0, 0, -1, -1);

2
board/ti/panda/panda.c
View File

@ -287,7 +287,7 @@ void set_muxconf_regs(void)
sizeof(struct pad_conf_entry));
}
#if defined(CONFIG_GENERIC_MMC)
#if defined(CONFIG_MMC)
int board_mmc_init(bd_t *bis)
{
return omap_mmc_init(0, 0, 0, -1, -1);

2
board/ti/sdp4430/sdp.c
View File

@ -73,7 +73,7 @@ void set_muxconf_regs(void)
sizeof(struct pad_conf_entry));
}
#if defined(CONFIG_GENERIC_MMC)
#if defined(CONFIG_MMC)
int board_mmc_init(bd_t *bis)
{
omap_mmc_init(0, 0, 0, -1, -1);

2
board/ti/ti814x/evm.c
View File

@ -111,7 +111,7 @@ int board_init(void)
return 0;
}
#if defined(CONFIG_GENERIC_MMC)
#if defined(CONFIG_MMC)
int board_mmc_init(bd_t *bis)
{
omap_mmc_init(1, 0, 0, -1, -1);

4
board/timll/devkit8000/devkit8000.c
View File

@ -131,14 +131,14 @@ void set_muxconf_regs(void)
MUX_DEVKIT8000();
}
#if defined(CONFIG_GENERIC_MMC)
#if defined(CONFIG_MMC)
int board_mmc_init(bd_t *bis)
{
return omap_mmc_init(0, 0, 0, -1, -1);
}
#endif
#if defined(CONFIG_GENERIC_MMC)
#if defined(CONFIG_MMC)
void board_mmc_power_init(void)
{
twl4030_power_mmc_init(0);

4
common/board_r.c
View File

@ -432,7 +432,7 @@ static int initr_onenand(void)
}
#endif
#ifdef CONFIG_GENERIC_MMC
#ifdef CONFIG_MMC
static int initr_mmc(void)
{
puts("MMC: ");
@ -815,7 +815,7 @@ static init_fnc_t init_sequence_r[] = {
#ifdef CONFIG_CMD_ONENAND
initr_onenand,
#endif
#ifdef CONFIG_GENERIC_MMC
#ifdef CONFIG_MMC
initr_mmc,
#endif
#ifdef CONFIG_HAS_DATAFLASH

2
common/spl/Kconfig
View File

@ -374,7 +374,7 @@ config SPL_LIBGENERIC_SUPPORT
config SPL_MMC_SUPPORT
bool "Support MMC"
depends on SPL && GENERIC_MMC
depends on SPL && MMC
help
Enable support for MMC (Multimedia Card) within SPL. This enables
the MMC protocol implementation and allows any enabled drivers to

4
drivers/mmc/Kconfig
View File

@ -10,10 +10,6 @@ config MMC
If you want MMC/SD/SDIO support, you should say Y here and
also to your specific host controller driver.
config GENERIC_MMC
bool "Generic MMC driver framework"
default MMC
config DM_MMC
bool "Enable MMC controllers using Driver Model"
depends on DM

10
drivers/mmc/Makefile
View File

@ -6,11 +6,11 @@
#
ifdef CONFIG_DM_MMC
obj-$(CONFIG_GENERIC_MMC) += mmc-uclass.o
obj-$(CONFIG_MMC) += mmc-uclass.o
endif
ifndef CONFIG_BLK
obj-$(CONFIG_GENERIC_MMC) += mmc_legacy.o
obj-$(CONFIG_MMC) += mmc_legacy.o
endif
obj-$(CONFIG_ARM_PL180_MMCI) += arm_pl180_mmci.o
@ -23,9 +23,9 @@ obj-$(CONFIG_MMC_DW_ROCKCHIP) += rockchip_dw_mmc.o
obj-$(CONFIG_MMC_DW_SOCFPGA) += socfpga_dw_mmc.o
obj-$(CONFIG_FSL_ESDHC) += fsl_esdhc.o
obj-$(CONFIG_FTSDC010) += ftsdc010_mci.o
obj-$(CONFIG_GENERIC_MMC) += mmc.o
obj-$(CONFIG_MMC) += mmc.o
ifdef CONFIG_SUPPORT_EMMC_BOOT
obj-$(CONFIG_GENERIC_MMC) += mmc_boot.o
obj-$(CONFIG_MMC) += mmc_boot.o
endif
obj-$(CONFIG_GENERIC_ATMEL_MCI) += gen_atmel_mci.o
obj-$(CONFIG_MMC_MESON_GX) += meson_gx_mmc.o
@ -46,7 +46,7 @@ ifdef CONFIG_SPL_BUILD
obj-$(CONFIG_SPL_MMC_BOOT) += fsl_esdhc_spl.o
obj-$(CONFIG_SPL_SAVEENV) += mmc_write.o
else
obj-$(CONFIG_GENERIC_MMC) += mmc_write.o
obj-$(CONFIG_MMC) += mmc_write.o
endif
# SDHCI

2
drivers/mmc/davinci_mmc.c
View File

@ -347,7 +347,7 @@ static int dmmc_init(struct mmc *mmc)
return 0;
}
/* Set buswidth or clock as indicated by the GENERIC_MMC framework */
/* Set buswidth or clock as indicated by the MMC framework */
static int dmmc_set_ios(struct mmc *mmc)
{
struct davinci_mmc *host = mmc->priv;