diff options
| author | Simon Glass <sjg@chromium.org> | 2011-06-03 09:12:34 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2011-08-29 10:39:14 -0700 |
| commit | 3ae75e44809b5c64c2df3e41a56f189f8ddba112 (patch) | |
| tree | 3b5a36176706007541941431083c3f9d91fd2643 /board | |
| parent | 3ed809965c6beafddb38431f8f2c78e0b03790d8 (diff) | |
Tidy up MMC to use to clock API
The MMC driver now uses the peripheral ID to identify which peripheral
to use rather than the address of that peripheral.
BUG=chromium-os:11623
TEST=build and boot U-Boot on Seaboard
mmc part 0; ext2ls mmc 0:3
Change-Id: I42c09bca572349f2c9c2469959857d247a6a359f
Reviewed-on: http://gerrit.chromium.org/gerrit/2035
Tested-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Anton Staaf <robotboy@chromium.org>
Tested-by: Anton Staaf <robotboy@chromium.org>
Diffstat (limited to 'board')
| -rw-r--r-- | board/nvidia/common/board.c | 20 | ||||
| -rw-r--r-- | board/nvidia/common/board.h | 2 |
2 files changed, 2 insertions, 20 deletions
diff --git a/board/nvidia/common/board.c b/board/nvidia/common/board.c index d70ca7ff04..93dc39c84f 100644 --- a/board/nvidia/common/board.c +++ b/board/nvidia/common/board.c @@ -129,17 +129,6 @@ static void pin_mux_uart(int uart_ids) } /* - * Routine: clock_init_mmc - * Description: init the PLL and clocks for the SDMMC controllers - */ -static void clock_init_mmc(void) -{ - /* Do the SDMMC resets/clock enables */ - clock_start_periph_pll(PERIPH_ID_SDMMC4, CLOCK_ID_PERIPH, CLK_20M); - clock_start_periph_pll(PERIPH_ID_SDMMC3, CLOCK_ID_PERIPH, CLK_20M); -} - -/* * Routine: pin_mux_mmc * Description: setup the pin muxes/tristate values for the SDMMC(s) */ @@ -281,17 +270,10 @@ int board_mmc_init(bd_t *bd) { debug("board_mmc_init called\n"); /* Enable clocks, muxes, etc. for SDMMC controllers */ - clock_init_mmc(); pin_mux_mmc(); gpio_config_mmc(); - debug("board_mmc_init: init eMMC\n"); - /* init dev 0, eMMC chip, with 4-bit bus */ - tegra2_mmc_init(0, 4); - - debug("board_mmc_init: init SD slot\n"); - /* init dev 1, SD slot, with 4-bit bus */ - tegra2_mmc_init(1, 4); + tegra2_mmc_init(gd->blob); return 0; } diff --git a/board/nvidia/common/board.h b/board/nvidia/common/board.h index b17dd3228e..b7a9af3005 100644 --- a/board/nvidia/common/board.h +++ b/board/nvidia/common/board.h @@ -28,6 +28,6 @@ void tegra2_start(void); void gpio_config_uart(const void *blob); void gpio_early_init_uart(const void *blob); void gpio_config_mmc(void); -int tegra2_mmc_init(int dev_index, int bus_width); +int tegra2_mmc_init(const void *blob); #endif /* BOARD_H */ |