From: Tony Lin <tony.lin@freescale.com>
Date: Tue, 12 Jul 2011 03:08:22 +0000 (+0800)
Subject: ENGR00152547-02 [MX6Q]add SDHC3.0 support on uSDHC controller
X-Git-Tag: v3.0.35-fsl_4.1.0~2431
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=33e34dbd1c9689bae95d75b3735327735bf31cff;p=karo-tx-linux.git

ENGR00152547-02 [MX6Q]add SDHC3.0 support on uSDHC controller

add CMD used on SDHC3.0 card
add specific parameters for SDHC3.0 card tuning

Signed-off-by: Tony Lin <tony.lin@freescale.com>
---

diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
index 6e652f9a4297..b7702db5ba46 100644
--- a/include/linux/mmc/card.h
+++ b/include/linux/mmc/card.h
@@ -93,6 +93,7 @@ struct sd_scr {
 	unsigned char		cmds;
 #define SD_SCR_CMD20_SUPPORT   (1<<0)
 #define SD_SCR_CMD23_SUPPORT   (1<<1)
+	unsigned char		sda_vsn3;
 };
 
 struct sd_ssr {
@@ -182,6 +183,9 @@ struct mmc_card {
 #define MMC_STATE_HIGHSPEED_DDR (1<<4)		/* card is in high speed mode */
 #define MMC_STATE_ULTRAHIGHSPEED (1<<5)		/* card is in ultra high speed mode */
 #define MMC_CARD_SDXC		(1<<6)		/* card is SDXC */
+#define MMC_STATE_SD_SDR50	(1<<5)		/* card is in sdr50 mode */
+#define MMC_STATE_SD_SDR104	(1<<6)		/* card is in sdr104 mode */
+#define MMC_STATE_SD_DDR50	(1<<7)		/* card is in ddr50 mode */
 	unsigned int		quirks; 	/* card quirks */
 #define MMC_QUIRK_LENIENT_FN0	(1<<0)		/* allow SDIO FN0 writes outside of the VS CCCR range */
 #define MMC_QUIRK_BLKSZ_FOR_BYTE_MODE (1<<1)	/* use func->cur_blksize */
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index f8d1e741d80c..66bf0fb1dbfa 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -74,6 +74,8 @@ struct mmc_ios {
 #define MMC_SET_DRIVER_TYPE_A	1
 #define MMC_SET_DRIVER_TYPE_C	2
 #define MMC_SET_DRIVER_TYPE_D	3
+	unsigned int	tuning_flag;		/* request tuning only */
+	unsigned int	tuning;			/* tuning parameter */
 };
 
 struct mmc_host_ops {
@@ -231,7 +233,9 @@ struct mmc_host {
 	unsigned int		max_req_size;	/* maximum number of bytes in one req */
 	unsigned int		max_blk_size;	/* maximum size of one mmc block */
 	unsigned int		max_blk_count;	/* maximum number of blocks in one req */
-
+	unsigned int		tuning_min;
+	unsigned int		tuning_max;
+	unsigned int		tuning_step;
 	/* private data */
 	spinlock_t		lock;		/* lock for claim and bus ops */
 
diff --git a/include/linux/mmc/sd.h b/include/linux/mmc/sd.h
index 7d35d52c3df3..ae7cf9519b21 100644
--- a/include/linux/mmc/sd.h
+++ b/include/linux/mmc/sd.h
@@ -91,5 +91,7 @@
 #define SD_SWITCH_ACCESS_DEF	0
 #define SD_SWITCH_ACCESS_HS	1
 
-#endif
+#define SD_VOLTAGE_SWITCH	11
+#define SD_TUNING_CMD		19
 
+#endif
diff --git a/include/linux/mmc/sdhci.h b/include/linux/mmc/sdhci.h
index 6a68c4eb4e44..eb07153d0451 100644
--- a/include/linux/mmc/sdhci.h
+++ b/include/linux/mmc/sdhci.h
@@ -159,6 +159,9 @@ struct sdhci_host {
 	unsigned int		tuning_mode;	/* Re-tuning mode supported by host */
 #define SDHCI_TUNING_MODE_1	0
 	struct timer_list	tuning_timer;	/* Timer for tuning */
+	unsigned int		tuning_min;
+	unsigned int		tuning_max;
+	unsigned int		tuning_step;
 
 	unsigned long private[0] ____cacheline_aligned;
 };