Merge branch 'for-next/mmc'

1 files changed, 14 insertions, 11 deletions

diff --git a/include/mci.h b/include/mci.h
index a45d744761..57a4629d12 100644
--- a/include/mci.h
+++ b/include/mci.h
@@ -367,6 +367,18 @@ struct mci_data {
 	unsigned blocksize;	/**< block size in bytes (mostly 512) */
 };
 
+enum mci_timing {
+	MMC_TIMING_LEGACY	= 0,
+	MMC_TIMING_MMC_HS	= 1,
+	MMC_TIMING_SD_HS	= 2,
+	MMC_TIMING_UHS_SDR12	= MMC_TIMING_LEGACY,
+	MMC_TIMING_UHS_SDR25	= MMC_TIMING_SD_HS,
+	MMC_TIMING_UHS_SDR50	= 3,
+	MMC_TIMING_UHS_SDR104	= 4,
+	MMC_TIMING_UHS_DDR50	= 5,
+	MMC_TIMING_MMC_HS200	= 6,
+};
+
 struct mci_ios {
 	unsigned int	clock;			/* clock rate */
 
@@ -376,17 +388,7 @@ struct mci_ios {
 #define MMC_BUS_WIDTH_4		2
 #define MMC_BUS_WIDTH_8		3
 
-	unsigned char	timing;			/* timing specification used */
-
-#define MMC_TIMING_LEGACY	0
-#define MMC_TIMING_MMC_HS	1
-#define MMC_TIMING_SD_HS	2
-#define MMC_TIMING_UHS_SDR12	MMC_TIMING_LEGACY
-#define MMC_TIMING_UHS_SDR25	MMC_TIMING_SD_HS
-#define MMC_TIMING_UHS_SDR50	3
-#define MMC_TIMING_UHS_SDR104	4
-#define MMC_TIMING_UHS_DDR50	5
-#define MMC_TIMING_MMC_HS200	6
+	enum mci_timing	timing;			/* timing specification used */
 
 #define MMC_SDR_MODE		0
 #define MMC_1_2V_DDR_MODE	1
@@ -408,6 +410,7 @@ struct mci_host {
 	unsigned f_max;		/**< host interface upper limit */
 	unsigned clock;		/**< Current clock used to talk to the card */
 	unsigned bus_width;	/**< used data bus width to the card */
+	enum mci_timing timing;	/**< used timing specification to the card */
 	unsigned max_req_size;
 	unsigned dsr_val;	/**< optional dsr value */
 	int use_dsr;		/**< optional dsr usage flag */