diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2011-12-06 11:58:13 +0100 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2011-12-06 11:58:13 +0100 |
| commit | a119957feee74d71818ee8caa593596fa55fbed9 (patch) | |
| tree | 78d688c5213044cd2cef22a1de7e31ade85d215d /drivers/mmc/host/mmci.h | |
| parent | 3240c33248a9dbc8d890f4e95471f809f47494f1 (diff) | |
| parent | 179594de57bacdfcde54bfb6e1151e3eefd390ba (diff) | |
Merge branch 'storage-mmc' into linux-stable-ux500-3.1
Diffstat (limited to 'drivers/mmc/host/mmci.h')
| -rw-r--r-- | drivers/mmc/host/mmci.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/mmc/host/mmci.h b/drivers/mmc/host/mmci.h index 79e4143ab9d..89eb2e3556d 100644 --- a/drivers/mmc/host/mmci.h +++ b/drivers/mmc/host/mmci.h @@ -13,16 +13,6 @@ #define MCI_PWR_ON 0x03 #define MCI_OD (1 << 6) #define MCI_ROD (1 << 7) -/* - * The ST Micro version does not have ROD and reuse the voltage registers - * for direction settings - */ -#define MCI_ST_DATA2DIREN (1 << 2) -#define MCI_ST_CMDDIREN (1 << 3) -#define MCI_ST_DATA0DIREN (1 << 4) -#define MCI_ST_DATA31DIREN (1 << 5) -#define MCI_ST_FBCLKEN (1 << 7) -#define MCI_ST_DATA74DIREN (1 << 8) #define MMCICLOCK 0x004 #define MCI_CLK_ENABLE (1 << 8) @@ -160,7 +150,7 @@ (MCI_RXFIFOHALFFULLMASK | MCI_RXDATAAVLBLMASK | \ MCI_TXFIFOHALFEMPTYMASK) -#define NR_SG 16 +#define NR_SG 128 struct clk; struct variant_data; |