Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-14 00:47:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

tegra2: Enable MMC for Seaboard

Browse source 
This adds the required GPIO and pinmux configuration to make eMMC / SD work
on Seaboard.

Signed-off-by: Simon Glass <sjg@chromium.org>
Tested-by: Tom Warren <twarren@nvidia.com>
This commit is contained in:
Tom Warren 2011-09-21 12:40:07 +00:00 committed by Albert ARIBAUD
parent 20e18e051f
commit ccf7988b9a
5 changed files with 63 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
board/nvidia/common/board.c
View file

@ -160,6 +160,7 @@ int board_mmc_init(bd_t *bd)
/* Enable clocks, muxes, etc. for SDMMC controllers */ /* Enable clocks, muxes, etc. for SDMMC controllers */
clock_init_mmc(); clock_init_mmc();
pin_mux_mmc(); pin_mux_mmc();
gpio_config_mmc();
debug("board_mmc_init: init eMMC\n"); debug("board_mmc_init: init eMMC\n");
/* init dev 0, eMMC chip, with 4-bit bus */ /* init dev 0, eMMC chip, with 4-bit bus */
@ -171,18 +172,6 @@ int board_mmc_init(bd_t *bd)
return 0; return 0;
} }
/* this is a weak define that we are overriding */
int board_mmc_getcd(u8 *cd, struct mmc *mmc)
{
debug("board_mmc_getcd called\n");
/*
* Hard-code CD presence for now. Need to add GPIO inputs
* for Seaboard & Harmony (& Kaen/Aebl/Wario?)
*/
*cd = 1;
return 0;
}
#endif #endif
#ifdef CONFIG_BOARD_EARLY_INIT_F #ifdef CONFIG_BOARD_EARLY_INIT_F

1
board/nvidia/common/board.h
View file

@ -26,6 +26,7 @@
void tegra2_start(void); void tegra2_start(void);
void gpio_config_uart(void); void gpio_config_uart(void);
void gpio_config_mmc(void);
int tegra2_mmc_init(int dev_index, int bus_width); int tegra2_mmc_init(int dev_index, int bus_width);
#endif /* BOARD_H */ #endif /* BOARD_H */

26
board/nvidia/harmony/harmony.c
View file

@ -24,6 +24,9 @@
#include <common.h> #include <common.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/tegra2.h> #include <asm/arch/tegra2.h>
#ifdef CONFIG_TEGRA2_MMC
#include <mmc.h>
#endif
/* /*
* Routine: gpio_config_uart * Routine: gpio_config_uart
@ -32,3 +35,26 @@
void gpio_config_uart(void) void gpio_config_uart(void)
{ {
} }
#ifdef CONFIG_TEGRA2_MMC
/*
* Routine: gpio_config_mmc
* Description: Set GPIOs for SD card
*/
void gpio_config_mmc(void)
{
/* Not implemented for now */
}
/* this is a weak define that we are overriding */
int board_mmc_getcd(u8 *cd, struct mmc *mmc)
{
debug("board_mmc_getcd called\n");
/*
* Hard-code CD presence for now. Need to add GPIO inputs
* for Harmony
*/
*cd = 1;
return 0;
}
#endif

35
board/nvidia/seaboard/seaboard.c
View file

@ -24,7 +24,10 @@
#include <common.h> #include <common.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/tegra2.h> #include <asm/arch/tegra2.h>
#include <asm/arch/gpio.h> #include <asm/gpio.h>
#ifdef CONFIG_TEGRA2_MMC
#include <mmc.h>
#endif
/* /*
* Routine: gpio_config_uart * Routine: gpio_config_uart
@ -50,3 +53,33 @@ void gpio_config_uart(void)
val |= 1 << GPIO_BIT(gp); val |= 1 << GPIO_BIT(gp);
writel(val, &bank->gpio_dir_out[GPIO_PORT(gp)]); writel(val, &bank->gpio_dir_out[GPIO_PORT(gp)]);
} }
#ifdef CONFIG_TEGRA2_MMC
/*
* Routine: gpio_config_mmc
* Description: Set GPIOs for SDMMC3 SDIO slot.
*/
void gpio_config_mmc(void)
{
/* Set EN_VDDIO_SD (GPIO I6) */
gpio_direction_output(GPIO_PI6, 1);
/* Config pin as GPI for Card Detect (GPIO I5) */
gpio_direction_input(GPIO_PI5);
}
/* this is a weak define that we are overriding */
int board_mmc_getcd(u8 *cd, struct mmc *mmc)
{
debug("board_mmc_getcd called\n");
*cd = 1; /* Assume card is inserted, or eMMC */
if (IS_SD(mmc)) {
/* Seaboard SDMMC3 = SDIO3_CD = GPIO_PI5 */
if (gpio_get_value(GPIO_PI5))
*cd = 0;
}
return 0;
}
#endif

2
drivers/mmc/tegra2_mmc.c
View file

@ -452,7 +452,7 @@ static int tegra2_mmc_initialize(int dev_index, int bus_width)
mmc->host_caps = MMC_MODE_8BIT; mmc->host_caps = MMC_MODE_8BIT;
else else
mmc->host_caps = MMC_MODE_4BIT; mmc->host_caps = MMC_MODE_4BIT;
mmc->host_caps |= MMC_MODE_HS_52MHz | MMC_MODE_HS; mmc->host_caps |= MMC_MODE_HS_52MHz | MMC_MODE_HS | MMC_MODE_HC;
/* /*
* min freq is for card identification, and is the highest * min freq is for card identification, and is the highest