Merge branch 'master' of git://git.denx.de/u-boot-mmc
* 'master' of git://git.denx.de/u-boot-mmc: tegra2: Move MMC clock initialization into MMC driver mmc: sdhci: fix sdma bug for large file transfer mmc: sdhci: add timeout for data transfer mmc: sdhci: add mmc structure for host mmc: sdhci: fix build warning mmc: sdhci: fix cache flush mmc: CMD7:MMC_CMD_SELECT_CARD response fix mmc: test mmc bus width on startup mmc: change magic number to macro define mmc: mv_sdhci: fix 8bus width access for 88SV331xV5 mmc: retry the cmd8 to meet 74 clocks requirement in the spec PXA: Add MMC driver using the generic MMC framework
This commit is contained in:
@@ -101,16 +101,6 @@ static void pin_mux_uart(void)
|
||||
}
|
||||
|
||||
#ifdef CONFIG_TEGRA2_MMC
|
||||
/*
|
||||
* Routine: clock_init_mmc
|
||||
* Description: init the PLL and clocks for the SDMMC controllers
|
||||
*/
|
||||
static void clock_init_mmc(void)
|
||||
{
|
||||
clock_start_periph_pll(PERIPH_ID_SDMMC4, CLOCK_ID_PERIPH, 20000000);
|
||||
clock_start_periph_pll(PERIPH_ID_SDMMC3, CLOCK_ID_PERIPH, 20000000);
|
||||
}
|
||||
|
||||
/*
|
||||
* Routine: pin_mux_mmc
|
||||
* Description: setup the pin muxes/tristate values for the SDMMC(s)
|
||||
@@ -157,8 +147,7 @@ int board_init(void)
|
||||
int board_mmc_init(bd_t *bd)
|
||||
{
|
||||
debug("board_mmc_init called\n");
|
||||
/* Enable clocks, muxes, etc. for SDMMC controllers */
|
||||
clock_init_mmc();
|
||||
/* Enable muxes, etc. for SDMMC controllers */
|
||||
pin_mux_mmc();
|
||||
gpio_config_mmc();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user