diff options
| author | Tom Warren <twarren@nvidia.com> | 2016-09-13 16:45:48 (GMT) |
|---|---|---|
| committer | Tom Warren <twarren@nvidia.com> | 2016-09-27 16:11:01 (GMT) |
| commit | 6a474db4894d37f2edf4ed12e23b9e46f7a8aa3d (patch) | |
| tree | 6a69764714f4ba55276020a74ccfd19ab531a719 /arch/arm/mach-tegra | |
| parent | c0be77dbdba504d24b6feb2f4669d8cac2497867 (diff) | |
| download | u-boot-6a474db4894d37f2edf4ed12e23b9e46f7a8aa3d.tar.xz | |
mmc: tegra: Add DM_MMC support to Tegra MMC driver
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>
Diffstat (limited to 'arch/arm/mach-tegra')
| -rw-r--r-- | arch/arm/mach-tegra/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board186.c | 8 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board2.c | 16 |
3 files changed, 1 insertions, 24 deletions
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig index 76909ee..fb4b32e 100644 --- a/arch/arm/mach-tegra/Kconfig +++ b/arch/arm/mach-tegra/Kconfig @@ -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 diff --git a/arch/arm/mach-tegra/board186.c b/arch/arm/mach-tegra/board186.c index 8b76205..a071758 100644 --- a/arch/arm/mach-tegra/board186.c +++ b/arch/arm/mach-tegra/board186.c @@ -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; -} diff --git a/arch/arm/mach-tegra/board2.c b/arch/arm/mach-tegra/board2.c index 3f87891..cb9503f 100644 --- a/arch/arm/mach-tegra/board2.c +++ b/arch/arm/mach-tegra/board2.c @@ -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. |