LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tegra2: Move tegra2_mmc_init() prototype to public header. 

tegra2_mmc_init() is implemented by the Tegra2 MMC driver. Since most of
the Tegra2-based boards will need to call it, this commit exports it in
the new public asm/arch/mmc.h header file to prevent each board from
providing its own prototype.

Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Acked-by: Stephen Warren <swarren@nvidia.com>
Tested-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Warren <twarren@nvidia.com>
This commit is contained in:
Thierry Reding 2011-11-17 00:10:23 +00:00 committed by Albert ARIBAUD
parent 0350c6b924
commit 977a39e600
5 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
arch/arm/include/asm/arch-tegra2/mmc.h Normal file
View File

@ -0,0 +1,27 @@
/*
* Copyright (c) 2011, Google Inc. All rights reserved.
* See file CREDITS for list of people who contributed to this
* project.
*
* 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 the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*/
#ifndef _TEGRA2_MMC_H_
#define _TEGRA2_MMC_H_
int tegra2_mmc_init(int dev_index, int bus_width, int pwr_gpio, int cd_gpio);
#endif /* TEGRA2_MMC_H_ */

1
board/nvidia/common/board.h
View File

@ -25,7 +25,6 @@
#define _BOARD_H_ #define _BOARD_H_
void gpio_config_uart(void); void gpio_config_uart(void);
int tegra2_mmc_init(int dev_index, int bus_width, int pwr_gpio, int cd_gpio);
void gpio_early_init_uart(void); void gpio_early_init_uart(void);
#endif /* BOARD_H */ #endif /* BOARD_H */

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

@ -25,11 +25,11 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/tegra2.h> #include <asm/arch/tegra2.h>
#include <asm/arch/pinmux.h> #include <asm/arch/pinmux.h>
#include <asm/arch/mmc.h>
#include <asm/gpio.h> #include <asm/gpio.h>
#ifdef CONFIG_TEGRA2_MMC #ifdef CONFIG_TEGRA2_MMC
#include <mmc.h> #include <mmc.h>
#endif #endif
#include "../common/board.h"
/* /*
* Routine: gpio_config_uart * Routine: gpio_config_uart

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

@ -25,11 +25,11 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/tegra2.h> #include <asm/arch/tegra2.h>
#include <asm/arch/pinmux.h> #include <asm/arch/pinmux.h>
#include <asm/arch/mmc.h>
#include <asm/gpio.h> #include <asm/gpio.h>
#ifdef CONFIG_TEGRA2_MMC #ifdef CONFIG_TEGRA2_MMC
#include <mmc.h> #include <mmc.h>
#endif #endif
#include "../common/board.h"
/* TODO: Remove this code when the SPI switch is working */ /* TODO: Remove this code when the SPI switch is working */
#ifndef CONFIG_SPI_UART_SWITCH #ifndef CONFIG_SPI_UART_SWITCH

2
drivers/mmc/tegra2_mmc.h
View File

@ -127,7 +127,5 @@ struct mmc_host {
int cd_gpio; /* Change Detect GPIO */ int cd_gpio; /* Change Detect GPIO */
}; };
int tegra2_mmc_init(int dev_index, int bus_width, int pwr_gpio, int cd_gpio);
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __TEGRA2_MMC_H_ */ #endif /* __TEGRA2_MMC_H_ */