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

mmc: tegra: Add DM_MMC support to Tegra MMC driver

Browse Source 
Convert the Tegra MMC driver to DM_MMC. Support for non-DM is removed
to avoid ifdefs in the code. DM_MMC is now enabled for all Tegra builds.

Cc: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>
(swarren, fixed some NULL pointer dereferences, removed extraneous
changes, rebased on various other changes, removed non-DM support etc.)
Signed-off-by: Stephen Warren <swarren@nvidia.com>
This commit is contained in:
Tom Warren
2016-09-13 10:45:48 -06:00
parent c0be77dbdb
commit 6a474db489
5 changed files with 72 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
arch/arm/include/asm/arch-tegra/mmc.h
View File

@@ -1,11 +0,0 @@
/*
* Copyright (c) 2011, Google Inc. All rights reserved.
* SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _TEGRA_MMC_H_
#define _TEGRA_MMC_H_
void tegra_mmc_init(void);
#endif /* _TEGRA_MMC_H_ */

1
arch/arm/mach-tegra/Kconfig
View File

@@ -27,6 +27,7 @@ config TEGRA_COMMON
select DM_GPIO
select DM_I2C
select DM_KEYBOARD
select DM_MMC
select DM_PCI
select DM_PCI_COMPAT
select DM_PWM

8
arch/arm/mach-tegra/board186.c
View File

@@ -6,7 +6,6 @@
#include <common.h>
#include <asm/arch/tegra.h>
#include <asm/arch-tegra/mmc.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -29,10 +28,3 @@ int board_late_init(void)
{
return 0;
}
int board_mmc_init(bd_t *bd)
{
tegra_mmc_init();
return 0;
}

16
arch/arm/mach-tegra/board2.c
View File

@@ -32,9 +32,6 @@
#ifdef CONFIG_USB_EHCI_TEGRA
#include <usb.h>
#endif
#ifdef CONFIG_TEGRA_MMC
#include <asm/arch-tegra/mmc.h>
#endif
#include <asm/arch-tegra/xusb-padctl.h>
#include <power/as3722.h>
#include <i2c.h>
@@ -234,19 +231,6 @@ int board_late_init(void)
return 0;
}
#if defined(CONFIG_TEGRA_MMC)
/* this is a weak define that we are overriding */
int board_mmc_init(bd_t *bd)
{
debug("%s called\n", __func__);
debug("%s: init MMC\n", __func__);
tegra_mmc_init();
return 0;
}
#endif /* MMC */
/*
* In some SW environments, a memory carve-out exists to house a secure
* monitor, a trusted OS, and/or various statically allocated media buffers.