From: T Karthik Reddy Date: Mon, 10 Jun 2019 04:04:04 +0000 (+0530) Subject: mmc: zynq_sdhci: Move UHS mode macros X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5deb2449538e669cc24f80852c24fc646b15239f;p=thirdparty%2Fu-boot.git mmc: zynq_sdhci: Move UHS mode macros This patch moves UHS mode macros from mmc.h to zynq_sdhci.c. Moving UHS mode macros in mmc.h avoids redefinition of macros when xenon_sdhci.c is compiled. Signed-off-by: T Karthik Reddy Signed-off-by: Michal Simek --- diff --git a/drivers/mmc/zynq_sdhci.c b/drivers/mmc/zynq_sdhci.c index 3f74de9ee6d..484dc479336 100644 --- a/drivers/mmc/zynq_sdhci.c +++ b/drivers/mmc/zynq_sdhci.c @@ -58,6 +58,13 @@ struct arasan_sdhci_priv { #if defined(CONFIG_ARCH_ZYNQMP) #define MMC_HS200_BUS_SPEED 5 +#define MMC_TIMING_UHS_SDR12 0 +#define MMC_TIMING_UHS_SDR25 1 +#define MMC_TIMING_UHS_SDR50 2 +#define MMC_TIMING_UHS_SDR104 3 +#define MMC_TIMING_UHS_DDR50 4 +#define MMC_TIMING_HS200 5 + static const u8 mode2timing[] = { [MMC_LEGACY] = UHS_SDR12_BUS_SPEED, [SD_LEGACY] = UHS_SDR12_BUS_SPEED, diff --git a/include/mmc.h b/include/mmc.h index 5e6774602bc..0767ee47586 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -342,12 +342,6 @@ enum mmc_voltage { #define MMC_NUM_BOOT_PARTITION 2 #define MMC_PART_RPMB 3 /* RPMB partition number */ -#define MMC_TIMING_UHS_SDR12 0 -#define MMC_TIMING_UHS_SDR25 1 -#define MMC_TIMING_UHS_SDR50 2 -#define MMC_TIMING_UHS_SDR104 3 -#define MMC_TIMING_UHS_DDR50 4 -#define MMC_TIMING_HS200 5 #define MMC_TIMING_HS 1 #define SD_HS_BUS_SPEED 6 #define MMC_DDR52_BUS_SPEED 7