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>

8 files changed, 21 insertions, 21 deletions

diff --git a/board/nvidia/common/board.c b/board/nvidia/common/board.c
index 7f1254447f8..035a32a663c 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 28e66a5b857..9ad9a731f50 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);
diff --git a/common/fdt_decode.c b/common/fdt_decode.c
index c9bb28f6d61..1e32ad9dbff 100644
--- a/common/fdt_decode.c
+++ b/common/fdt_decode.c
@@ -577,7 +577,7 @@ int fdt_decode_usb(const void *blob, int node, unsigned osc_frequency_mhz,
 
 int fdt_decode_sdmmc(const void *blob, int node, struct fdt_sdmmc *config)
 {
-	config->reg = (struct tegra2_mmc *)get_addr(blob, node, "reg");
+	config->reg = (struct tegra_mmc *)get_addr(blob, node, "reg");
 	config->enabled = get_is_enabled(blob, node, 1);
 	config->periph_id = get_int(blob, node, "periph-id", -1);
 	config->width = get_int(blob, node, "width", -1);
diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile
index dce373d6f39..7508046c5b0 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 2953a5d4338..7f943b2afc6 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 a008c303630..1ee0a7dabe7 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_ */
diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h
index b8f7baa31bc..4805fa07a21 100644
--- a/include/configs/seaboard.h
+++ b/include/configs/seaboard.h
@@ -228,7 +228,7 @@
 /* SD/MMC */
 #define CONFIG_MMC
 #define CONFIG_GENERIC_MMC
-#define CONFIG_TEGRA2_MMC
+#define CONFIG_TEGRA_MMC
 #define CONFIG_CMD_MMC
 
 #define CONFIG_DOS_PARTITION
diff --git a/include/fdt_decode.h b/include/fdt_decode.h
index 8e522653bca..e787b902bf4 100644
--- a/include/fdt_decode.h
+++ b/include/fdt_decode.h
@@ -196,7 +196,7 @@ struct fdt_usb {
 
 /* Information about an SDMMC port */
 struct fdt_sdmmc {
-	struct tegra2_mmc *reg;	/* address of registers in physical memory */
+	struct tegra_mmc *reg;	/* address of registers in physical memory */
 	int width;		/* port width in bits (normally 4) */
 	int removable;		/* 1 for removable device, 0 for fixed */
 	int enabled;		/* 1 to enable, 0 to disable */