diff options
| author | Pierre Bourdon <[email protected]> | 2019-04-11 04:56:58 +0200 |
|---|---|---|
| committer | Stefan Roese <[email protected]> | 2019-04-26 07:35:38 +0200 |
| commit | 4ec9dd4071cb3e7d2c0c42f2eea935edceba5b7e (patch) | |
| tree | 833720a3d156d52d05b39c44532795f7315f4dfa /arch | |
| parent | 5561943ba2ce290545b99d886459bb3a41c65f2c (diff) | |
mmc: mv_sdhci: add driver model support
The new DM implementation currently does not support the Sheeva
88SV331xV5 specific quirk present in the legacy implementation. The
legacy code is thus kept for this SoC and others not yet migrated to
DM_MMC.
Signed-off-by: Pierre Bourdon <[email protected]>
Cc: Jaehoon Chung <[email protected]>
Cc: Stefan Roese <[email protected]>
Reviewed-by: Stefan Roese <[email protected]>
Signed-off-by: Stefan Roese <[email protected]>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-mvebu/cpu.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mvebu/include/mach/cpu.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c index c5b3df46aab..f09e7b10e93 100644 --- a/arch/arm/mach-mvebu/cpu.c +++ b/arch/arm/mach-mvebu/cpu.c @@ -520,7 +520,7 @@ int arch_misc_init(void) } #endif /* CONFIG_ARCH_MISC_INIT */ -#ifdef CONFIG_MMC_SDHCI_MV +#if defined(CONFIG_MMC_SDHCI_MV) && !defined(CONFIG_DM_MMC) int board_mmc_init(bd_t *bis) { mv_sdh_init(MVEBU_SDIO_BASE, 0, 0, diff --git a/arch/arm/mach-mvebu/include/mach/cpu.h b/arch/arm/mach-mvebu/include/mach/cpu.h index b9153d86c66..e6140d67293 100644 --- a/arch/arm/mach-mvebu/include/mach/cpu.h +++ b/arch/arm/mach-mvebu/include/mach/cpu.h @@ -144,7 +144,9 @@ u32 mvebu_get_nand_clock(void); void return_to_bootrom(void); +#ifndef CONFIG_DM_MMC int mv_sdh_init(unsigned long regbase, u32 max_clk, u32 min_clk, u32 quirks); +#endif void get_sar_freq(struct sar_freq_modes *sar_freq); |