diff options
| author | Doug Anderson <dianders@chromium.org> | 2011-10-27 12:55:25 -0700 |
|---|---|---|
| committer | Gerrit <chrome-bot@google.com> | 2011-10-28 10:38:27 -0700 |
| commit | 186e1be5e2555ff51d496ad7a179b5988ae6be9a (patch) | |
| tree | 6e8df7c09b4b333e9577517e05751f2f62580443 /drivers | |
| parent | e175c4a364801ffc3cd5a1012d920cb2beb6bd6b (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 'drivers')
| -rw-r--r-- | drivers/mmc/Makefile | 2 | ||||
| -rw-r--r-- | drivers/mmc/tegra_mmc.c (renamed from drivers/mmc/tegra2_mmc.c) | 14 | ||||
| -rw-r--r-- | drivers/mmc/tegra_mmc.h (renamed from drivers/mmc/tegra2_mmc.h) | 10 |
3 files changed, 13 insertions, 13 deletions
diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile index dce373d6f3..7508046c5b 100644 --- a/drivers/mmc/Makefile +++ b/drivers/mmc/Makefile @@ -38,7 +38,7 @@ COBJS-$(CONFIG_OMAP3_MMC) += omap3_mmc.o COBJS-$(CONFIG_OMAP_HSMMC) += omap_hsmmc.o COBJS-$(CONFIG_PXA_MMC) += pxa_mmc.o COBJS-$(CONFIG_S5P_MMC) += s5p_mmc.o -COBJS-$(CONFIG_TEGRA2_MMC) += tegra2_mmc.o +COBJS-$(CONFIG_TEGRA_MMC) += tegra_mmc.o COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c) diff --git a/drivers/mmc/tegra2_mmc.c b/drivers/mmc/tegra_mmc.c index 2953a5d433..7f943b2afc 100644 --- a/drivers/mmc/tegra2_mmc.c +++ b/drivers/mmc/tegra_mmc.c @@ -29,7 +29,7 @@ #include <asm/arch/gpio.h> #include <malloc.h> #include <asm/clocks.h> -#include "tegra2_mmc.h" +#include "tegra_mmc.h" #include "fdt_decode.h" enum { @@ -38,7 +38,7 @@ enum { struct mmc_host { - struct tegra2_mmc *reg; + struct tegra_mmc *reg; unsigned int version; /* SDHCI spec. version */ unsigned int clock; /* Current clock (MHz) */ enum periph_id mmc_id; /* Peripheral ID of the SDMMC we are using */ @@ -604,13 +604,13 @@ static int mmc_core_init(struct mmc *mmc) } static int init_port(unsigned dev_index, enum periph_id mmc_id, - struct tegra2_mmc *reg, int bus_width, int removable, + struct tegra_mmc *reg, int bus_width, int removable, int cd_gpio, int wp_gpio) { struct mmc_host *host; struct mmc *mmc; - debug(" tegra2_mmc_init: index %d, bus width %d, removable %d\n", + debug(" tegra_mmc_init: index %d, bus width %d, removable %d\n", dev_index, bus_width, removable); if (dev_index >= MAX_HOSTS) return -1; @@ -674,7 +674,7 @@ int board_mmc_getcd(u8 *cd, struct mmc *mmc) return 0; } -int tegra2_mmc_init(const void *blob) +int tegra_mmc_init(const void *blob) { #ifdef CONFIG_OF_CONTROL struct fdt_sdmmc config; @@ -707,7 +707,7 @@ int tegra2_mmc_init(const void *blob) /* init dev 0, eMMC chip, with 4-bit bus, non-removable */ if (init_port(0, PERIPH_ID_SDMMC4, - (struct tegra2_mmc *)NV_PA_SDMMC4_BASE, 4, 0, -1, -1)) + (struct tegra_mmc *)NV_PA_SDMMC4_BASE, 4, 0, -1, -1)) return -1; /* @@ -720,7 +720,7 @@ int tegra2_mmc_init(const void *blob) gpio_direction_input(GPIO_PI5); if (init_port(1, PERIPH_ID_SDMMC3, - (struct tegra2_mmc *)NV_PA_SDMMC3_BASE, 4, 1, GPIO_PI5, + (struct tegra_mmc *)NV_PA_SDMMC3_BASE, 4, 1, GPIO_PI5, GPIO_PH1)) return -1; #endif diff --git a/drivers/mmc/tegra2_mmc.h b/drivers/mmc/tegra_mmc.h index a008c30363..1ee0a7dabe 100644 --- a/drivers/mmc/tegra2_mmc.h +++ b/drivers/mmc/tegra_mmc.h @@ -20,11 +20,11 @@ * */ -#ifndef __TEGRA2_MMC_H_ -#define __TEGRA2_MMC_H_ +#ifndef __TEGRA_MMC_H_ +#define __TEGRA_MMC_H_ #ifndef __ASSEMBLY__ -struct tegra2_mmc { +struct tegra_mmc { unsigned int sysad; /* _SYSTEM_ADDRESS_0 */ unsigned short blksize; /* _BLOCK_SIZE_BLOCK_COUNT_0 15:00 */ unsigned short blkcnt; /* _BLOCK_SIZE_BLOCK_COUNT_0 31:16 */ @@ -65,7 +65,7 @@ struct tegra2_mmc { unsigned char res6[0x100]; /* RESERVED, offset 100h-1FFh */ }; -int tegra2_mmc_init(const void *blob); +int tegra_mmc_init(const void *blob); #endif /* __ASSEMBLY__ */ -#endif /* __TEGRA2_MMC_H_ */ +#endif /* __TEGRA_MMC_H_ */ |