From 6a474db4894d37f2edf4ed12e23b9e46f7a8aa3d Mon Sep 17 00:00:00 2001 From: Tom Warren Date: Tue, 13 Sep 2016 10:45:48 -0600 Subject: 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 Signed-off-by: Tom Warren (swarren, fixed some NULL pointer dereferences, removed extraneous changes, rebased on various other changes, removed non-DM support etc.) Signed-off-by: Stephen Warren --- arch/arm/include/asm/arch-tegra/mmc.h | 11 ----------- arch/arm/mach-tegra/Kconfig | 1 + arch/arm/mach-tegra/board186.c | 8 -------- arch/arm/mach-tegra/board2.c | 16 ---------------- 4 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 arch/arm/include/asm/arch-tegra/mmc.h (limited to 'arch/arm') diff --git a/arch/arm/include/asm/arch-tegra/mmc.h b/arch/arm/include/asm/arch-tegra/mmc.h deleted file mode 100644 index c2d52b2..0000000 --- a/arch/arm/include/asm/arch-tegra/mmc.h +++ /dev/null @@ -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_ */ 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 #include -#include 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 #endif -#ifdef CONFIG_TEGRA_MMC -#include -#endif #include #include #include @@ -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. -- cgit v1.1