mirrors/u-boot
0
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2024-11-27 22:56:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-mmc

Browse Source 
- Add #undef CONFIG_DM_MMC_OPS to omap3_logic in the SPL build case, to
  match other TI platforms in the same situation.

Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini 2017-05-15 20:17:56 -04:00
commit 4125bbcef6
52 changed files with 173 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -653,7 +653,6 @@ libs-y += drivers/
libs-y += drivers/dma/ libs-y += drivers/dma/
libs-y += drivers/gpio/ libs-y += drivers/gpio/
libs-y += drivers/i2c/ libs-y += drivers/i2c/
libs-y += drivers/mmc/
libs-y += drivers/mtd/ libs-y += drivers/mtd/
libs-$(CONFIG_CMD_NAND) += drivers/mtd/nand/ libs-$(CONFIG_CMD_NAND) += drivers/mtd/nand/
libs-y += drivers/mtd/onenand/ libs-y += drivers/mtd/onenand/

2
arch/arm/Kconfig
View File

@ -654,7 +654,7 @@ config ARCH_SUNXI
imply SPL_LIBCOMMON_SUPPORT imply SPL_LIBCOMMON_SUPPORT
imply SPL_LIBDISK_SUPPORT imply SPL_LIBDISK_SUPPORT
imply SPL_LIBGENERIC_SUPPORT imply SPL_LIBGENERIC_SUPPORT
imply SPL_MMC_SUPPORT if GENERIC_MMC imply SPL_MMC_SUPPORT if MMC
imply SPL_POWER_SUPPORT imply SPL_POWER_SUPPORT
imply SPL_SERIAL_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; return rv;
} }
#endif /* defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD) */ #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) int board_mmc_init(bd_t *bis)
{ {
return omap_mmc_init(1, 0, 0, -1, -1); 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(); leds_set_finish();
} }
#if defined(CONFIG_GENERIC_MMC) #if defined(CONFIG_MMC)
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
int ret; int ret;

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

@ -33,7 +33,7 @@ int board_init(void)
return 0; return 0;
} }
#ifdef CONFIG_GENERIC_MMC #ifdef CONFIG_MMC
#define SB_SOM_CD_GPIO 187 #define SB_SOM_CD_GPIO 187
#define SB_SOM_WP_GPIO 188 #define SB_SOM_WP_GPIO 188
@ -51,7 +51,7 @@ int board_mmc_init(bd_t *bis)
return ret0 && ret1; return ret0 && ret1;
} }
#endif /* CONFIG_GENERIC_MMC */ #endif /* CONFIG_MMC */
int misc_init_r(void) 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(); cm_t3730_set_muxconf();
} }
#if defined(CONFIG_GENERIC_MMC) #if defined(CONFIG_MMC)
#define SB_T35_WP_GPIO 59 #define SB_T35_WP_GPIO 59
int board_mmc_getcd(struct mmc *mmc) int board_mmc_getcd(struct mmc *mmc)
@ -391,7 +391,7 @@ int board_mmc_init(bd_t *bis)
} }
#endif #endif
#if defined(CONFIG_GENERIC_MMC) #if defined(CONFIG_MMC)
void board_mmc_power_init(void) void board_mmc_power_init(void)
{ {
twl4030_power_mmc_init(0); 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; return 0;
} }
#if defined(CONFIG_GENERIC_MMC) #if defined(CONFIG_MMC)
#define SB_T35_CD_GPIO 144 #define SB_T35_CD_GPIO 144
#define SB_T35_WP_GPIO 59 #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 #endif
#if defined(CONFIG_GENERIC_MMC) #if defined(CONFIG_MMC)
#define SB_T54_CD_GPIO 228 #define SB_T54_CD_GPIO 228
#define SB_T54_WP_GPIO 229 #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(); MUX_TRICORDER();
} }
#if defined(CONFIG_GENERIC_MMC) #if defined(CONFIG_MMC)
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
return omap_mmc_init(0, 0, 0, -1, -1); return omap_mmc_init(0, 0, 0, -1, -1);
} }
#endif #endif
#if defined(CONFIG_GENERIC_MMC) #if defined(CONFIG_MMC)
void board_mmc_power_init(void) void board_mmc_power_init(void)
{ {
twl4030_power_mmc_init(0); 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)); sizeof(struct pad_conf_entry));
} }
#if defined(CONFIG_GENERIC_MMC) #if defined(CONFIG_MMC)
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
return omap_mmc_init(0, 0, 0, -1, -1); 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; return 0;
} }
#ifdef CONFIG_GENERIC_MMC #ifdef CONFIG_MMC
static int init_dwmmc(void) 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) {} static inline void setup_net_chip(void) {}
#endif #endif
#if defined(CONFIG_GENERIC_MMC) #if defined(CONFIG_MMC)
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
return omap_mmc_init(0, 0, 0, -1, -1); return omap_mmc_init(0, 0, 0, -1, -1);
} }
#endif #endif
#if defined(CONFIG_GENERIC_MMC) #if defined(CONFIG_MMC)
void board_mmc_power_init(void) void board_mmc_power_init(void)
{ {
twl4030_power_mmc_init(0); twl4030_power_mmc_init(0);

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

@ -152,7 +152,7 @@ void set_muxconf_regs(void)
MUX_AM3517EVM(); MUX_AM3517EVM();
} }
#if defined(CONFIG_GENERIC_MMC) #if defined(CONFIG_MMC)
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
return omap_mmc_init(0, 0, 0, -1, -1); 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 #endif
#if defined(CONFIG_GENERIC_MMC) #if defined(CONFIG_MMC)
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
return omap_mmc_init(0, 0, 0, -1, -1); return omap_mmc_init(0, 0, 0, -1, -1);
} }
#endif #endif
#if defined(CONFIG_GENERIC_MMC) #if defined(CONFIG_MMC)
void board_mmc_power_init(void) void board_mmc_power_init(void)
{ {
twl4030_power_mmc_init(0); 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(); MUX_ZOOM1_MDK();
} }
#ifdef CONFIG_GENERIC_MMC #ifdef CONFIG_MMC
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
return omap_mmc_init(0, 0, 0, -1, -1); 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 #endif
#if defined(CONFIG_GENERIC_MMC) #if defined(CONFIG_MMC)
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
return omap_mmc_init(0, 0, 0, -1, -1); return omap_mmc_init(0, 0, 0, -1, -1);
} }
#endif #endif
#if defined(CONFIG_GENERIC_MMC) #if defined(CONFIG_MMC)
void board_mmc_power_init(void) void board_mmc_power_init(void)
{ {
twl4030_power_mmc_init(0); 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) int board_mmc_init(bd_t *bis)
{ {
return omap_mmc_init(0, 0, 0, -1, -1); return omap_mmc_init(0, 0, 0, -1, -1);

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

@ -50,7 +50,7 @@ void set_muxconf_regs(void)
MUX_CAIRO(); MUX_CAIRO();
} }
#if defined(CONFIG_GENERIC_MMC) #if defined(CONFIG_MMC)
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
return omap_mmc_init(0, 0, 0, -1, -1); 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; return 0;
} }
#ifdef CONFIG_GENERIC_MMC #ifdef CONFIG_MMC
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
int ret; int ret;

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

@ -250,7 +250,7 @@ int board_eth_init(bd_t *bis)
return 0; return 0;
} }
#ifdef CONFIG_GENERIC_MMC #ifdef CONFIG_MMC
static int init_mmc(void) static int init_mmc(void)
{ {
#ifdef CONFIG_MMC_SDHCI #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) static void display_board_info(void)
{ {
#ifdef CONFIG_GENERIC_MMC #ifdef CONFIG_MMC
struct mmc *mmc = find_mmc_device(0); struct mmc *mmc = find_mmc_device(0);
#endif #endif
vidinfo_t *vid = &panel_info; 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 banks: %u\n", CONFIG_NR_DRAM_BANKS);
lcd_printf("\tDRAM size: %u MB\n", gd->ram_size / SZ_1M); lcd_printf("\tDRAM size: %u MB\n", gd->ram_size / SZ_1M);
#ifdef CONFIG_GENERIC_MMC #ifdef CONFIG_MMC
if (mmc) { if (mmc) {
if (!mmc->capacity) if (!mmc->capacity)
mmc_init(mmc); mmc_init(mmc);

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

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

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

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

2
board/sunxi/board.c
View File

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

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

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

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

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

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

@ -661,7 +661,7 @@ err:
} }
#endif #endif
#if defined(CONFIG_GENERIC_MMC) #if defined(CONFIG_MMC)
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
omap_mmc_init(0, 0, 0, -1, -1); 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(); MUX_BEAGLE();
} }
#if defined(CONFIG_GENERIC_MMC) #if defined(CONFIG_MMC)
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
return omap_mmc_init(0, 0, 0, -1, -1); return omap_mmc_init(0, 0, 0, -1, -1);
} }
#endif #endif
#if defined(CONFIG_GENERIC_MMC) #if defined(CONFIG_MMC)
void board_mmc_power_init(void) void board_mmc_power_init(void)
{ {
twl4030_power_mmc_init(0); twl4030_power_mmc_init(0);

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

@ -702,7 +702,7 @@ err:
} }
#endif #endif
#if defined(CONFIG_GENERIC_MMC) #if defined(CONFIG_MMC)
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
omap_mmc_init(0, 0, 0, -1, -1); 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 */ #endif /* CONFIG_CMD_NET */
#if defined(CONFIG_GENERIC_MMC) #if defined(CONFIG_MMC)
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
return omap_mmc_init(0, 0, 0, -1, -1); return omap_mmc_init(0, 0, 0, -1, -1);
} }
#endif #endif
#if defined(CONFIG_GENERIC_MMC) #if defined(CONFIG_MMC)
void board_mmc_power_init(void) void board_mmc_power_init(void)
{ {
twl4030_power_mmc_init(0); 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 -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) int board_mmc_init(bd_t *bis)
{ {
if (psc_enable_module(KS2_LPSC_MMC)) { 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)); sizeof(struct pad_conf_entry));
} }
#if defined(CONFIG_GENERIC_MMC) #if defined(CONFIG_MMC)
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
omap_mmc_init(0, 0, 0, -1, -1); 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)); sizeof(struct pad_conf_entry));
} }
#if defined(CONFIG_GENERIC_MMC) #if defined(CONFIG_MMC)
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
return omap_mmc_init(0, 0, 0, -1, -1); 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)); sizeof(struct pad_conf_entry));
} }
#if defined(CONFIG_GENERIC_MMC) #if defined(CONFIG_MMC)
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
omap_mmc_init(0, 0, 0, -1, -1); 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; return 0;
} }
#if defined(CONFIG_GENERIC_MMC) #if defined(CONFIG_MMC)
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
omap_mmc_init(1, 0, 0, -1, -1); 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(); MUX_DEVKIT8000();
} }
#if defined(CONFIG_GENERIC_MMC) #if defined(CONFIG_MMC)
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
return omap_mmc_init(0, 0, 0, -1, -1); return omap_mmc_init(0, 0, 0, -1, -1);
} }
#endif #endif
#if defined(CONFIG_GENERIC_MMC) #if defined(CONFIG_MMC)
void board_mmc_power_init(void) void board_mmc_power_init(void)
{ {
twl4030_power_mmc_init(0); twl4030_power_mmc_init(0);

4
common/board_r.c
View File

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

4
common/spl/Kconfig
View File

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

3
configs/blanche_defconfig
View File

@ -15,8 +15,7 @@ CONFIG_CMD_EXT2=y
CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4=y
CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_FAT=y CONFIG_CMD_FAT=y
# CONFIG_MMC is not set CONFIG_MMC=y
CONFIG_GENERIC_MMC=y
CONFIG_MTD_NOR_FLASH=y CONFIG_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_BAR=y

1
configs/sandbox_noblk_defconfig
View File

@ -105,7 +105,6 @@ CONFIG_CROS_EC_SPI=y
CONFIG_PWRSEQ=y CONFIG_PWRSEQ=y
CONFIG_SPL_PWRSEQ=y CONFIG_SPL_PWRSEQ=y
# CONFIG_MMC is not set # CONFIG_MMC is not set
CONFIG_GENERIC_MMC=y
CONFIG_SPI_FLASH_SANDBOX=y CONFIG_SPI_FLASH_SANDBOX=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_ATMEL=y CONFIG_SPI_FLASH_ATMEL=y

1
drivers/Makefile
View File

@ -76,6 +76,7 @@ obj-y += firmware/
obj-$(CONFIG_FPGA) += fpga/ obj-$(CONFIG_FPGA) += fpga/
obj-y += hwmon/ obj-y += hwmon/
obj-y += misc/ obj-y += misc/
obj-$(CONFIG_MMC) += mmc/
obj-y += pcmcia/ obj-y += pcmcia/
obj-y += dfu/ obj-y += dfu/
obj-$(CONFIG_X86) += pch/ obj-$(CONFIG_X86) += pch/

5
drivers/mmc/Kconfig
View File

@ -10,10 +10,6 @@ config MMC
If you want MMC/SD/SDIO support, you should say Y here and If you want MMC/SD/SDIO support, you should say Y here and
also to your specific host controller driver. also to your specific host controller driver.
config GENERIC_MMC
bool "Generic MMC driver framework"
default MMC
config DM_MMC config DM_MMC
bool "Enable MMC controllers using Driver Model" bool "Enable MMC controllers using Driver Model"
depends on DM depends on DM
@ -138,6 +134,7 @@ config MMC_PCI
config MMC_OMAP_HS config MMC_OMAP_HS
bool "TI OMAP High Speed Multimedia Card Interface support" bool "TI OMAP High Speed Multimedia Card Interface support"
select DM_MMC_OPS if DM_MMC
help help
This selects the TI OMAP High Speed Multimedia card Interface. This selects the TI OMAP High Speed Multimedia card Interface.
If you have an omap2plus board with a Multimedia Card slot, If you have an omap2plus board with a Multimedia Card slot,

28
drivers/mmc/Makefile
View File

@ -5,17 +5,24 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
ifdef CONFIG_DM_MMC obj-y += mmc.o
obj-$(CONFIG_GENERIC_MMC) += mmc-uclass.o obj-$(CONFIG_DM_MMC) += mmc-uclass.o
endif
ifndef CONFIG_BLK ifndef CONFIG_BLK
obj-$(CONFIG_GENERIC_MMC) += mmc_legacy.o obj-y += mmc_legacy.o
endif
obj-$(CONFIG_SUPPORT_EMMC_BOOT) += mmc_boot.o
ifdef CONFIG_SPL_BUILD
obj-$(CONFIG_SPL_MMC_BOOT) += fsl_esdhc_spl.o
obj-$(CONFIG_SPL_SAVEENV) += mmc_write.o
else
obj-y += mmc_write.o
endif endif
obj-$(CONFIG_ARM_PL180_MMCI) += arm_pl180_mmci.o obj-$(CONFIG_ARM_PL180_MMCI) += arm_pl180_mmci.o
obj-$(CONFIG_MMC_DAVINCI) += davinci_mmc.o obj-$(CONFIG_MMC_DAVINCI) += davinci_mmc.o
obj-$(CONFIG_MMC_DW) += dw_mmc.o obj-$(CONFIG_MMC_DW) += dw_mmc.o
obj-$(CONFIG_MMC_DW_EXYNOS) += exynos_dw_mmc.o obj-$(CONFIG_MMC_DW_EXYNOS) += exynos_dw_mmc.o
obj-$(CONFIG_MMC_DW_K3) += hi6220_dw_mmc.o obj-$(CONFIG_MMC_DW_K3) += hi6220_dw_mmc.o
@ -23,10 +30,6 @@ obj-$(CONFIG_MMC_DW_ROCKCHIP) += rockchip_dw_mmc.o
obj-$(CONFIG_MMC_DW_SOCFPGA) += socfpga_dw_mmc.o obj-$(CONFIG_MMC_DW_SOCFPGA) += socfpga_dw_mmc.o
obj-$(CONFIG_FSL_ESDHC) += fsl_esdhc.o obj-$(CONFIG_FSL_ESDHC) += fsl_esdhc.o
obj-$(CONFIG_FTSDC010) += ftsdc010_mci.o obj-$(CONFIG_FTSDC010) += ftsdc010_mci.o
obj-$(CONFIG_GENERIC_MMC) += mmc.o
ifdef CONFIG_SUPPORT_EMMC_BOOT
obj-$(CONFIG_GENERIC_MMC) += mmc_boot.o
endif
obj-$(CONFIG_GENERIC_ATMEL_MCI) += gen_atmel_mci.o obj-$(CONFIG_GENERIC_ATMEL_MCI) += gen_atmel_mci.o
obj-$(CONFIG_MMC_MESON_GX) += meson_gx_mmc.o obj-$(CONFIG_MMC_MESON_GX) += meson_gx_mmc.o
obj-$(CONFIG_MMC_SPI) += mmc_spi.o obj-$(CONFIG_MMC_SPI) += mmc_spi.o
@ -42,13 +45,6 @@ obj-$(CONFIG_MMC_SANDBOX) += sandbox_mmc.o
obj-$(CONFIG_SH_MMCIF) += sh_mmcif.o obj-$(CONFIG_SH_MMCIF) += sh_mmcif.o
obj-$(CONFIG_SH_SDHI) += sh_sdhi.o obj-$(CONFIG_SH_SDHI) += sh_sdhi.o
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
endif
# SDHCI # SDHCI
obj-$(CONFIG_MMC_SDHCI) += sdhci.o obj-$(CONFIG_MMC_SDHCI) += sdhci.o
obj-$(CONFIG_MMC_SDHCI_ATMEL) += atmel_sdhci.o obj-$(CONFIG_MMC_SDHCI_ATMEL) += atmel_sdhci.o

4
drivers/mmc/atmel_sdhci.c
View File

@ -28,7 +28,7 @@ int atmel_sdhci_init(void *regbase, u32 id)
host->name = "atmel_sdhci"; host->name = "atmel_sdhci";
host->ioaddr = regbase; host->ioaddr = regbase;
host->quirks = 0; host->quirks = SDHCI_QUIRK_WAIT_SEND_CMD;
max_clk = at91_get_periph_generated_clk(id); max_clk = at91_get_periph_generated_clk(id);
if (!max_clk) { if (!max_clk) {
printf("%s: Failed to get the proper clock\n", __func__); printf("%s: Failed to get the proper clock\n", __func__);
@ -74,7 +74,7 @@ static int atmel_sdhci_probe(struct udevice *dev)
host->name = dev->name; host->name = dev->name;
host->ioaddr = (void *)dev_get_addr(dev); host->ioaddr = (void *)dev_get_addr(dev);
host->quirks = 0; host->quirks = SDHCI_QUIRK_WAIT_SEND_CMD;
host->bus_width = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev), host->bus_width = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev),
"bus-width", 4); "bus-width", 4);

2
drivers/mmc/davinci_mmc.c
View File

@ -347,7 +347,7 @@ static int dmmc_init(struct mmc *mmc)
return 0; 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) static int dmmc_set_ios(struct mmc *mmc)
{ {
struct davinci_mmc *host = mmc->priv; struct davinci_mmc *host = mmc->priv;

39
drivers/mmc/omap_hsmmc.c
View File

@ -326,11 +326,17 @@ static void mmc_reset_controller_fsm(struct hsmmc *mmc_base, u32 bit)
} }
} }
} }
#ifndef CONFIG_DM_MMC
static int omap_hsmmc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, static int omap_hsmmc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd,
struct mmc_data *data) struct mmc_data *data)
{ {
struct omap_hsmmc_data *priv = omap_hsmmc_get_data(mmc); struct omap_hsmmc_data *priv = omap_hsmmc_get_data(mmc);
#else
static int omap_hsmmc_send_cmd(struct udevice *dev, struct mmc_cmd *cmd,
struct mmc_data *data)
{
struct omap_hsmmc_data *priv = dev_get_priv(dev);
#endif
struct hsmmc *mmc_base; struct hsmmc *mmc_base;
unsigned int flags, mmc_stat; unsigned int flags, mmc_stat;
ulong start; ulong start;
@ -558,9 +564,17 @@ static int mmc_write_data(struct hsmmc *mmc_base, const char *buf,
return 0; return 0;
} }
#ifndef CONFIG_DM_MMC
static int omap_hsmmc_set_ios(struct mmc *mmc) static int omap_hsmmc_set_ios(struct mmc *mmc)
{ {
struct omap_hsmmc_data *priv = omap_hsmmc_get_data(mmc); struct omap_hsmmc_data *priv = omap_hsmmc_get_data(mmc);
#else
static int omap_hsmmc_set_ios(struct udevice *dev)
{
struct omap_hsmmc_data *priv = dev_get_priv(dev);
struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev);
struct mmc *mmc = upriv->mmc;
#endif
struct hsmmc *mmc_base; struct hsmmc *mmc_base;
unsigned int dsor = 0; unsigned int dsor = 0;
ulong start; ulong start;
@ -617,9 +631,9 @@ static int omap_hsmmc_set_ios(struct mmc *mmc)
#ifdef OMAP_HSMMC_USE_GPIO #ifdef OMAP_HSMMC_USE_GPIO
#ifdef CONFIG_DM_MMC #ifdef CONFIG_DM_MMC
static int omap_hsmmc_getcd(struct mmc *mmc) static int omap_hsmmc_getcd(struct udevice *dev)
{ {
struct omap_hsmmc_data *priv = omap_hsmmc_get_data(mmc); struct omap_hsmmc_data *priv = dev_get_priv(dev);
int value; int value;
value = dm_gpio_get_value(&priv->cd_gpio); value = dm_gpio_get_value(&priv->cd_gpio);
@ -632,9 +646,9 @@ static int omap_hsmmc_getcd(struct mmc *mmc)
return value; return value;
} }
static int omap_hsmmc_getwp(struct mmc *mmc) static int omap_hsmmc_getwp(struct udevice *dev)
{ {
struct omap_hsmmc_data *priv = omap_hsmmc_get_data(mmc); struct omap_hsmmc_data *priv = dev_get_priv(dev);
int value; int value;
value = dm_gpio_get_value(&priv->wp_gpio); value = dm_gpio_get_value(&priv->wp_gpio);
@ -674,6 +688,16 @@ static int omap_hsmmc_getwp(struct mmc *mmc)
#endif #endif
#endif #endif
#ifdef CONFIG_DM_MMC
static const struct dm_mmc_ops omap_hsmmc_ops = {
.send_cmd = omap_hsmmc_send_cmd,
.set_ios = omap_hsmmc_set_ios,
#ifdef OMAP_HSMMC_USE_GPIO
.get_cd = omap_hsmmc_getcd,
.get_wp = omap_hsmmc_getwp,
#endif
};
#else
static const struct mmc_ops omap_hsmmc_ops = { static const struct mmc_ops omap_hsmmc_ops = {
.send_cmd = omap_hsmmc_send_cmd, .send_cmd = omap_hsmmc_send_cmd,
.set_ios = omap_hsmmc_set_ios, .set_ios = omap_hsmmc_set_ios,
@ -683,6 +707,7 @@ static const struct mmc_ops omap_hsmmc_ops = {
.getwp = omap_hsmmc_getwp, .getwp = omap_hsmmc_getwp,
#endif #endif
}; };
#endif
#ifndef CONFIG_DM_MMC #ifndef CONFIG_DM_MMC
int omap_mmc_init(int dev_index, uint host_caps_mask, uint f_max, int cd_gpio, int omap_mmc_init(int dev_index, uint host_caps_mask, uint f_max, int cd_gpio,
@ -835,7 +860,6 @@ static int omap_hsmmc_probe(struct udevice *dev)
struct mmc *mmc; struct mmc *mmc;
cfg->name = "OMAP SD/MMC"; cfg->name = "OMAP SD/MMC";
cfg->ops = &omap_hsmmc_ops;
priv->base_addr = plat->base_addr; priv->base_addr = plat->base_addr;
#ifdef OMAP_HSMMC_USE_GPIO #ifdef OMAP_HSMMC_USE_GPIO
priv->cd_inverted = plat->cd_inverted; priv->cd_inverted = plat->cd_inverted;
@ -857,7 +881,7 @@ static int omap_hsmmc_probe(struct udevice *dev)
mmc->dev = dev; mmc->dev = dev;
upriv->mmc = mmc; upriv->mmc = mmc;
return 0; return omap_hsmmc_init_setup(mmc);
} }
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
@ -901,6 +925,7 @@ U_BOOT_DRIVER(omap_hsmmc) = {
#ifdef CONFIG_BLK #ifdef CONFIG_BLK
.bind = omap_hsmmc_bind, .bind = omap_hsmmc_bind,
#endif #endif
.ops = &omap_hsmmc_ops,
.probe = omap_hsmmc_probe, .probe = omap_hsmmc_probe,
.priv_auto_alloc_size = sizeof(struct omap_hsmmc_data), .priv_auto_alloc_size = sizeof(struct omap_hsmmc_data),
.flags = DM_FLAG_PRE_RELOC, .flags = DM_FLAG_PRE_RELOC,

67
drivers/mmc/sdhci-cadence.c
View File

@ -7,8 +7,10 @@
#include <common.h> #include <common.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/iopoll.h>
#include <linux/sizes.h> #include <linux/sizes.h>
#include <dm/device.h> #include <dm/device.h>
#include <libfdt.h>
#include <mmc.h> #include <mmc.h>
#include <sdhci.h> #include <sdhci.h>
@ -17,7 +19,7 @@
#define SDHCI_CDNS_HRS04_ACK BIT(26) #define SDHCI_CDNS_HRS04_ACK BIT(26)
#define SDHCI_CDNS_HRS04_RD BIT(25) #define SDHCI_CDNS_HRS04_RD BIT(25)
#define SDHCI_CDNS_HRS04_WR BIT(24) #define SDHCI_CDNS_HRS04_WR BIT(24)
#define SDHCI_CDNS_HRS04_RDATA_SHIFT 12 #define SDHCI_CDNS_HRS04_RDATA_SHIFT 16
#define SDHCI_CDNS_HRS04_WDATA_SHIFT 8 #define SDHCI_CDNS_HRS04_WDATA_SHIFT 8
#define SDHCI_CDNS_HRS04_ADDR_SHIFT 0 #define SDHCI_CDNS_HRS04_ADDR_SHIFT 0
@ -34,6 +36,9 @@
#define SDHCI_CDNS_PHY_DLY_EMMC_LEGACY 0x06 #define SDHCI_CDNS_PHY_DLY_EMMC_LEGACY 0x06
#define SDHCI_CDNS_PHY_DLY_EMMC_SDR 0x07 #define SDHCI_CDNS_PHY_DLY_EMMC_SDR 0x07
#define SDHCI_CDNS_PHY_DLY_EMMC_DDR 0x08 #define SDHCI_CDNS_PHY_DLY_EMMC_DDR 0x08
#define SDHCI_CDNS_PHY_DLY_SDCLK 0x0b
#define SDHCI_CDNS_PHY_DLY_HSMMC 0x0c
#define SDHCI_CDNS_PHY_DLY_STROBE 0x0d
struct sdhci_cdns_plat { struct sdhci_cdns_plat {
struct mmc_config cfg; struct mmc_config cfg;
@ -41,11 +46,31 @@ struct sdhci_cdns_plat {
void __iomem *hrs_addr; void __iomem *hrs_addr;
}; };
static void sdhci_cdns_write_phy_reg(struct sdhci_cdns_plat *plat, struct sdhci_cdns_phy_cfg {
u8 addr, u8 data) const char *property;
u8 addr;
};
static const struct sdhci_cdns_phy_cfg sdhci_cdns_phy_cfgs[] = {
{ "cdns,phy-input-delay-sd-highspeed", SDHCI_CDNS_PHY_DLY_SD_HS, },
{ "cdns,phy-input-delay-legacy", SDHCI_CDNS_PHY_DLY_SD_DEFAULT, },
{ "cdns,phy-input-delay-sd-uhs-sdr12", SDHCI_CDNS_PHY_DLY_UHS_SDR12, },
{ "cdns,phy-input-delay-sd-uhs-sdr25", SDHCI_CDNS_PHY_DLY_UHS_SDR25, },
{ "cdns,phy-input-delay-sd-uhs-sdr50", SDHCI_CDNS_PHY_DLY_UHS_SDR50, },
{ "cdns,phy-input-delay-sd-uhs-ddr50", SDHCI_CDNS_PHY_DLY_UHS_DDR50, },
{ "cdns,phy-input-delay-mmc-highspeed", SDHCI_CDNS_PHY_DLY_EMMC_SDR, },
{ "cdns,phy-input-delay-mmc-ddr", SDHCI_CDNS_PHY_DLY_EMMC_DDR, },
{ "cdns,phy-dll-delay-sdclk", SDHCI_CDNS_PHY_DLY_SDCLK, },
{ "cdns,phy-dll-delay-sdclk-hsmmc", SDHCI_CDNS_PHY_DLY_HSMMC, },
{ "cdns,phy-dll-delay-strobe", SDHCI_CDNS_PHY_DLY_STROBE, },
};
static int sdhci_cdns_write_phy_reg(struct sdhci_cdns_plat *plat,
u8 addr, u8 data)
{ {
void __iomem *reg = plat->hrs_addr + SDHCI_CDNS_HRS04; void __iomem *reg = plat->hrs_addr + SDHCI_CDNS_HRS04;
u32 tmp; u32 tmp;
int ret;
tmp = (data << SDHCI_CDNS_HRS04_WDATA_SHIFT) | tmp = (data << SDHCI_CDNS_HRS04_WDATA_SHIFT) |
(addr << SDHCI_CDNS_HRS04_ADDR_SHIFT); (addr << SDHCI_CDNS_HRS04_ADDR_SHIFT);
@ -54,17 +79,36 @@ static void sdhci_cdns_write_phy_reg(struct sdhci_cdns_plat *plat,
tmp |= SDHCI_CDNS_HRS04_WR; tmp |= SDHCI_CDNS_HRS04_WR;
writel(tmp, reg); writel(tmp, reg);
ret = readl_poll_timeout(reg, tmp, tmp & SDHCI_CDNS_HRS04_ACK, 10);
if (ret)
return ret;
tmp &= ~SDHCI_CDNS_HRS04_WR; tmp &= ~SDHCI_CDNS_HRS04_WR;
writel(tmp, reg); writel(tmp, reg);
return 0;
} }
static void sdhci_cdns_phy_init(struct sdhci_cdns_plat *plat) static int sdhci_cdns_phy_init(struct sdhci_cdns_plat *plat,
const void *fdt, int nodeoffset)
{ {
sdhci_cdns_write_phy_reg(plat, SDHCI_CDNS_PHY_DLY_SD_HS, 4); const u32 *prop;
sdhci_cdns_write_phy_reg(plat, SDHCI_CDNS_PHY_DLY_SD_DEFAULT, 4); int ret, i;
sdhci_cdns_write_phy_reg(plat, SDHCI_CDNS_PHY_DLY_EMMC_LEGACY, 9);
sdhci_cdns_write_phy_reg(plat, SDHCI_CDNS_PHY_DLY_EMMC_SDR, 2); for (i = 0; i < ARRAY_SIZE(sdhci_cdns_phy_cfgs); i++) {
sdhci_cdns_write_phy_reg(plat, SDHCI_CDNS_PHY_DLY_EMMC_DDR, 3); prop = fdt_getprop(fdt, nodeoffset,
sdhci_cdns_phy_cfgs[i].property, NULL);
if (!prop)
continue;
ret = sdhci_cdns_write_phy_reg(plat,
sdhci_cdns_phy_cfgs[i].addr,
fdt32_to_cpu(*prop));
if (ret)
return ret;
}
return 0;
} }
static int sdhci_cdns_bind(struct udevice *dev) static int sdhci_cdns_bind(struct udevice *dev)
@ -76,6 +120,7 @@ static int sdhci_cdns_bind(struct udevice *dev)
static int sdhci_cdns_probe(struct udevice *dev) static int sdhci_cdns_probe(struct udevice *dev)
{ {
DECLARE_GLOBAL_DATA_PTR;
struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev);
struct sdhci_cdns_plat *plat = dev_get_platdata(dev); struct sdhci_cdns_plat *plat = dev_get_platdata(dev);
struct sdhci_host *host = dev_get_priv(dev); struct sdhci_host *host = dev_get_priv(dev);
@ -94,7 +139,9 @@ static int sdhci_cdns_probe(struct udevice *dev)
host->ioaddr = plat->hrs_addr + SDHCI_CDNS_SRS_BASE; host->ioaddr = plat->hrs_addr + SDHCI_CDNS_SRS_BASE;
host->quirks |= SDHCI_QUIRK_WAIT_SEND_CMD; host->quirks |= SDHCI_QUIRK_WAIT_SEND_CMD;
sdhci_cdns_phy_init(plat); ret = sdhci_cdns_phy_init(plat, gd->fdt_blob, dev->of_offset);
if (ret)
return ret;
ret = sdhci_setup_cfg(&plat->cfg, host, 0, 0); ret = sdhci_setup_cfg(&plat->cfg, host, 0, 0);
if (ret) if (ret)

18
drivers/mmc/sdhci.c
View File

@ -332,8 +332,7 @@ static int sdhci_set_clock(struct mmc *mmc, unsigned int clock)
*/ */
if (host->clk_mul) { if (host->clk_mul) {
for (div = 1; div <= 1024; div++) { for (div = 1; div <= 1024; div++) {
if ((host->max_clk * host->clk_mul / div) if ((host->max_clk / div) <= clock)
<= clock)
break; break;
} }
@ -547,6 +546,14 @@ int sdhci_setup_cfg(struct mmc_config *cfg, struct sdhci_host *host,
#ifndef CONFIG_DM_MMC_OPS #ifndef CONFIG_DM_MMC_OPS
cfg->ops = &sdhci_ops; cfg->ops = &sdhci_ops;
#endif #endif
/* Check whether the clock multiplier is supported or not */
if (SDHCI_GET_VERSION(host) >= SDHCI_SPEC_300) {
caps_1 = sdhci_readl(host, SDHCI_CAPABILITIES_1);
host->clk_mul = (caps_1 & SDHCI_CLOCK_MUL_MASK) >>
SDHCI_CLOCK_MUL_SHIFT;
}
if (host->max_clk == 0) { if (host->max_clk == 0) {
if (SDHCI_GET_VERSION(host) >= SDHCI_SPEC_300) if (SDHCI_GET_VERSION(host) >= SDHCI_SPEC_300)
host->max_clk = (caps & SDHCI_CLOCK_V3_BASE_MASK) >> host->max_clk = (caps & SDHCI_CLOCK_V3_BASE_MASK) >>
@ -555,6 +562,8 @@ int sdhci_setup_cfg(struct mmc_config *cfg, struct sdhci_host *host,
host->max_clk = (caps & SDHCI_CLOCK_BASE_MASK) >> host->max_clk = (caps & SDHCI_CLOCK_BASE_MASK) >>
SDHCI_CLOCK_BASE_SHIFT; SDHCI_CLOCK_BASE_SHIFT;
host->max_clk *= 1000000; host->max_clk *= 1000000;
if (host->clk_mul)
host->max_clk *= host->clk_mul;
} }
if (host->max_clk == 0) { if (host->max_clk == 0) {
printf("%s: Hardware doesn't specify base clock frequency\n", printf("%s: Hardware doesn't specify base clock frequency\n",
@ -590,11 +599,6 @@ int sdhci_setup_cfg(struct mmc_config *cfg, struct sdhci_host *host,
if (SDHCI_GET_VERSION(host) >= SDHCI_SPEC_300) { if (SDHCI_GET_VERSION(host) >= SDHCI_SPEC_300) {
if (!(caps & SDHCI_CAN_DO_8BIT)) if (!(caps & SDHCI_CAN_DO_8BIT))
cfg->host_caps &= ~MMC_MODE_8BIT; cfg->host_caps &= ~MMC_MODE_8BIT;
/* Find out whether clock multiplier is supported */
caps_1 = sdhci_readl(host, SDHCI_CAPABILITIES_1);
host->clk_mul = (caps_1 & SDHCI_CLOCK_MUL_MASK) >>
SDHCI_CLOCK_MUL_SHIFT;
} }
if (host->host_caps) if (host->host_caps)

2
include/configs/am335x_evm.h
View File

@ -291,6 +291,8 @@
* DM support in SPL * DM support in SPL
*/ */
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_SPL_BUILD
#undef CONFIG_DM_MMC
#undef CONFIG_DM_MMC_OPS
#undef CONFIG_TIMER #undef CONFIG_TIMER
#undef CONFIG_DM_USB #undef CONFIG_DM_USB
#endif #endif

1
include/configs/am335x_shc.h
View File

@ -262,6 +262,7 @@
*/ */
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_SPL_BUILD
#undef CONFIG_DM_MMC #undef CONFIG_DM_MMC
#undef CONFIG_DM_MMC_OPS
#undef CONFIG_TIMER #undef CONFIG_TIMER
#endif #endif

1
include/configs/chiliboard.h
View File

@ -188,6 +188,7 @@
*/ */
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_SPL_BUILD
#undef CONFIG_DM_MMC #undef CONFIG_DM_MMC
#undef CONFIG_DM_MMC_OPS
#undef CONFIG_TIMER #undef CONFIG_TIMER
#undef CONFIG_DM_USB #undef CONFIG_DM_USB
#endif #endif

1
include/configs/omap3_logic.h
View File

@ -23,6 +23,7 @@
* DM support in SPL * DM support in SPL
*/ */
#undef CONFIG_DM_MMC #undef CONFIG_DM_MMC
#undef CONFIG_DM_MMC_OPS
#undef OMAP_HSMMC_USE_GPIO #undef OMAP_HSMMC_USE_GPIO
/* select serial console configuration for SPL */ /* select serial console configuration for SPL */