V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

mmc: tegra2: rename tegra2_mmc.* to tegra_mmc.* 

In anticipation of Tegra3 support, continue removing/renaming
Tegra2-specific files. No functional changes (yet).
Updated copyrights to 2012.

Signed-off-by: Tom Warren <twarren@nvidia.com>
This commit is contained in:
Tom Warren 2012-05-22 11:44:48 +00:00 committed by Albert ARIBAUD
parent edffa63d3d
commit 3f82d89d3d
14 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
board/nvidia/harmony/harmony.c
View File

@ -29,7 +29,7 @@
#include <asm/arch/pinmux.h> #include <asm/arch/pinmux.h>
#include <asm/arch/mmc.h> #include <asm/arch/mmc.h>
#include <asm/gpio.h> #include <asm/gpio.h>
#ifdef CONFIG_TEGRA2_MMC #ifdef CONFIG_TEGRA_MMC
#include <mmc.h> #include <mmc.h>
#endif #endif
@ -41,7 +41,7 @@ void gpio_config_uart(void)
{ {
} }
#ifdef CONFIG_TEGRA2_MMC #ifdef CONFIG_TEGRA_MMC
/* /*
* Routine: pin_mux_mmc * Routine: pin_mux_mmc
* Description: setup the pin muxes/tristate values for the SDMMC(s) * Description: setup the pin muxes/tristate values for the SDMMC(s)

4
board/nvidia/seaboard/seaboard.c
View File

@ -29,7 +29,7 @@
#include <asm/arch/pinmux.h> #include <asm/arch/pinmux.h>
#include <asm/arch/mmc.h> #include <asm/arch/mmc.h>
#include <asm/gpio.h> #include <asm/gpio.h>
#ifdef CONFIG_TEGRA2_MMC #ifdef CONFIG_TEGRA_MMC
#include <mmc.h> #include <mmc.h>
#endif #endif
@ -54,7 +54,7 @@ void gpio_config_uart(void)
} }
#endif #endif
#ifdef CONFIG_TEGRA2_MMC #ifdef CONFIG_TEGRA_MMC
/* /*
* Routine: pin_mux_mmc * Routine: pin_mux_mmc
* Description: setup the pin muxes/tristate values for the SDMMC(s) * Description: setup the pin muxes/tristate values for the SDMMC(s)

2
board/nvidia/whistler/whistler.c
View File

@ -30,7 +30,7 @@
#include <asm/arch/pinmux.h> #include <asm/arch/pinmux.h>
#include <asm/arch/mmc.h> #include <asm/arch/mmc.h>
#include <asm/gpio.h> #include <asm/gpio.h>
#ifdef CONFIG_TEGRA2_MMC #ifdef CONFIG_TEGRA_MMC
#include <mmc.h> #include <mmc.h>
#endif #endif

2
drivers/mmc/Makefile
View File

@ -42,7 +42,7 @@ COBJS-$(CONFIG_PXA_MMC_GENERIC) += pxa_mmc_gen.o
COBJS-$(CONFIG_SDHCI) += sdhci.o COBJS-$(CONFIG_SDHCI) += sdhci.o
COBJS-$(CONFIG_S5P_SDHCI) += s5p_sdhci.o COBJS-$(CONFIG_S5P_SDHCI) += s5p_sdhci.o
COBJS-$(CONFIG_SH_MMCIF) += sh_mmcif.o COBJS-$(CONFIG_SH_MMCIF) += sh_mmcif.o
COBJS-$(CONFIG_TEGRA2_MMC) += tegra2_mmc.o COBJS-$(CONFIG_TEGRA_MMC) += tegra_mmc.o
COBJS := $(COBJS-y) COBJS := $(COBJS-y)
SRCS := $(COBJS:.o=.c) SRCS := $(COBJS:.o=.c)

4
drivers/mmc/tegra2_mmc.c → drivers/mmc/tegra_mmc.c
View File

@ -2,7 +2,7 @@
* (C) Copyright 2009 SAMSUNG Electronics * (C) Copyright 2009 SAMSUNG Electronics
* Minkyu Kang <mk7.kang@samsung.com> * Minkyu Kang <mk7.kang@samsung.com>
* Jaehoon Chung <jh80.chung@samsung.com> * Jaehoon Chung <jh80.chung@samsung.com>
* Portions Copyright 2011 NVIDIA Corporation * Portions Copyright 2011-2012 NVIDIA Corporation
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -25,7 +25,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/clk_rst.h> #include <asm/arch/clk_rst.h>
#include <asm/arch/clock.h> #include <asm/arch/clock.h>
#include "tegra2_mmc.h" #include "tegra_mmc.h"
/* support 4 mmc hosts */ /* support 4 mmc hosts */
struct mmc mmc_dev[4]; struct mmc mmc_dev[4];

8
drivers/mmc/tegra2_mmc.h → drivers/mmc/tegra_mmc.h
View File

@ -1,7 +1,7 @@
/* /*
* (C) Copyright 2009 SAMSUNG Electronics * (C) Copyright 2009 SAMSUNG Electronics
* Minkyu Kang <mk7.kang@samsung.com> * Minkyu Kang <mk7.kang@samsung.com>
* Portions Copyright (C) 2011 NVIDIA Corporation * Portions Copyright (C) 2011-2012 NVIDIA Corporation
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -19,8 +19,8 @@
* *
*/ */
#ifndef __TEGRA2_MMC_H_ #ifndef __TEGRA_MMC_H_
#define __TEGRA2_MMC_H_ #define __TEGRA_MMC_H_
#define TEGRA2_SDMMC1_BASE 0xC8000000 #define TEGRA2_SDMMC1_BASE 0xC8000000
#define TEGRA2_SDMMC2_BASE 0xC8000200 #define TEGRA2_SDMMC2_BASE 0xC8000200
@ -128,4 +128,4 @@ struct mmc_host {
}; };
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __TEGRA2_MMC_H_ */ #endif /* __TEGRA_MMC_H_ */

2
include/configs/harmony.h
View File

@ -55,7 +55,7 @@
/* SD/MMC */ /* SD/MMC */
#define CONFIG_MMC #define CONFIG_MMC
#define CONFIG_GENERIC_MMC #define CONFIG_GENERIC_MMC
#define CONFIG_TEGRA2_MMC #define CONFIG_TEGRA_MMC
#define CONFIG_CMD_MMC #define CONFIG_CMD_MMC
#define CONFIG_DOS_PARTITION #define CONFIG_DOS_PARTITION

2
include/configs/medcom.h
View File

@ -45,7 +45,7 @@
/* SD/MMC */ /* SD/MMC */
#define CONFIG_MMC #define CONFIG_MMC
#define CONFIG_GENERIC_MMC #define CONFIG_GENERIC_MMC
#define CONFIG_TEGRA2_MMC #define CONFIG_TEGRA_MMC
#define CONFIG_CMD_MMC #define CONFIG_CMD_MMC
#define CONFIG_DOS_PARTITION #define CONFIG_DOS_PARTITION

2
include/configs/paz00.h
View File

@ -42,7 +42,7 @@
/* SD/MMC */ /* SD/MMC */
#define CONFIG_MMC #define CONFIG_MMC
#define CONFIG_GENERIC_MMC #define CONFIG_GENERIC_MMC
#define CONFIG_TEGRA2_MMC #define CONFIG_TEGRA_MMC
#define CONFIG_CMD_MMC #define CONFIG_CMD_MMC
#define CONFIG_DOS_PARTITION #define CONFIG_DOS_PARTITION

2
include/configs/plutux.h
View File

@ -45,7 +45,7 @@
/* SD/MMC */ /* SD/MMC */
#define CONFIG_MMC #define CONFIG_MMC
#define CONFIG_GENERIC_MMC #define CONFIG_GENERIC_MMC
#define CONFIG_TEGRA2_MMC #define CONFIG_TEGRA_MMC
#define CONFIG_CMD_MMC #define CONFIG_CMD_MMC
#define CONFIG_DOS_PARTITION #define CONFIG_DOS_PARTITION

2
include/configs/seaboard.h
View File

@ -86,7 +86,7 @@
/* SD/MMC */ /* SD/MMC */
#define CONFIG_MMC #define CONFIG_MMC
#define CONFIG_GENERIC_MMC #define CONFIG_GENERIC_MMC
#define CONFIG_TEGRA2_MMC #define CONFIG_TEGRA_MMC
#define CONFIG_CMD_MMC #define CONFIG_CMD_MMC
#define CONFIG_DOS_PARTITION #define CONFIG_DOS_PARTITION

2
include/configs/trimslice.h
View File

@ -58,7 +58,7 @@
/* SD/MMC */ /* SD/MMC */
#define CONFIG_MMC #define CONFIG_MMC
#define CONFIG_GENERIC_MMC #define CONFIG_GENERIC_MMC
#define CONFIG_TEGRA2_MMC #define CONFIG_TEGRA_MMC
#define CONFIG_CMD_MMC #define CONFIG_CMD_MMC
#define CONFIG_DOS_PARTITION #define CONFIG_DOS_PARTITION

2
include/configs/ventana.h
View File

@ -49,7 +49,7 @@
/* SD/MMC */ /* SD/MMC */
#define CONFIG_MMC #define CONFIG_MMC
#define CONFIG_GENERIC_MMC #define CONFIG_GENERIC_MMC
#define CONFIG_TEGRA2_MMC #define CONFIG_TEGRA_MMC
#define CONFIG_CMD_MMC #define CONFIG_CMD_MMC
#define CONFIG_DOS_PARTITION #define CONFIG_DOS_PARTITION

2
include/configs/whistler.h
View File

@ -58,7 +58,7 @@
/* SD/MMC */ /* SD/MMC */
#define CONFIG_MMC #define CONFIG_MMC
#define CONFIG_GENERIC_MMC #define CONFIG_GENERIC_MMC
#define CONFIG_TEGRA2_MMC #define CONFIG_TEGRA_MMC
#define CONFIG_CMD_MMC #define CONFIG_CMD_MMC
#define CONFIG_DOS_PARTITION #define CONFIG_DOS_PARTITION