summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorDoug Anderson <dianders@chromium.org>2011-10-27 12:55:25 -0700
committerGerrit <chrome-bot@google.com>2011-10-28 10:38:27 -0700
commit186e1be5e2555ff51d496ad7a179b5988ae6be9a (patch)
tree6e8df7c09b4b333e9577517e05751f2f62580443 /board
parente175c4a364801ffc3cd5a1012d920cb2beb6bd6b (diff)
mmc: tegra: Rename tegra2_mmc to tegra_mmc in prep for tegra3
BUG=chromium-os:21540 TEST=Built u-boot and booted u-boot on tegra2_kaen Change-Id: Id6f11512ea1a95bd57b600601b488ae20b34db2d Signed-off-by: Doug Anderson <dianders@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/10808 Reviewed-by: Tom Warren <twarren@nvidia.com> Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'board')
-rw-r--r--board/nvidia/common/board.c8
-rw-r--r--board/nvidia/common/board.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/board/nvidia/common/board.c b/board/nvidia/common/board.c
index 7f1254447f..035a32a663 100644
--- a/board/nvidia/common/board.c
+++ b/board/nvidia/common/board.c
@@ -55,7 +55,7 @@
#include "board.h"
#include "pmu.h"
-#ifdef CONFIG_TEGRA2_MMC
+#ifdef CONFIG_TEGRA_MMC
#include <mmc.h>
#endif
#ifdef CONFIG_OF_CONTROL
@@ -171,7 +171,7 @@ static void pin_mux_switches(void)
#endif /* CONFIG_TEGRA2 */
}
-#ifdef CONFIG_TEGRA2_MMC
+#ifdef CONFIG_TEGRA_MMC
/*
* Routine: pin_mux_mmc
* Description: setup the pin muxes/tristate values for the SDMMC(s)
@@ -342,7 +342,7 @@ int board_early_init_f(void)
}
#endif /* EARLY_INIT */
-#ifdef CONFIG_TEGRA2_MMC
+#ifdef CONFIG_TEGRA_MMC
/* this is a weak define that we are overriding */
int board_mmc_init(bd_t *bd)
{
@@ -351,7 +351,7 @@ int board_mmc_init(bd_t *bd)
/* Enable muxes, etc. for SDMMC controllers */
pin_mux_mmc();
- tegra2_mmc_init(gd->blob);
+ tegra_mmc_init(gd->blob);
return 0;
}
diff --git a/board/nvidia/common/board.h b/board/nvidia/common/board.h
index 28e66a5b85..9ad9a731f5 100644
--- a/board/nvidia/common/board.h
+++ b/board/nvidia/common/board.h
@@ -27,7 +27,7 @@
void gpio_config_uart(const void *blob);
void gpio_early_init_uart(const void *blob);
void gpio_config_mmc(void);
-int tegra2_mmc_init(const void *blob);
+int tegra_mmc_init(const void *blob);
void lcd_early_init(const void *blob);
int lcd_pinmux_early_init(const void *blob);
int tegra_get_chip_type(void);