aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc/sdhci.h
diff options
context:
space:
mode:
authorPierre Ossman <drzeus@drzeus.cx>2006-06-30 05:22:25 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-07-02 11:02:04 -0400
commit1c8cde92fa5c57daa9ff58d970ca6374f8d484a2 (patch)
tree96ddfe6071bcede86521fda46c0eafd27c4689c1 /drivers/mmc/sdhci.h
parente16514d8d86ecbde18a2a7495cf028861b34c157 (diff)
[MMC] sdhci: proper timeout handling
Use the give timeout clock and calculate a proper timeout instead of using the maximum at all times. Signed-off-by: Pierre Ossman <drzeus@drzeus.cx> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/mmc/sdhci.h')
-rw-r--r--drivers/mmc/sdhci.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/mmc/sdhci.h b/drivers/mmc/sdhci.h
index aed4abd37bfd..a8f45215ef3a 100644
--- a/drivers/mmc/sdhci.h
+++ b/drivers/mmc/sdhci.h
@@ -125,6 +125,9 @@
125/* 3E-3F reserved */ 125/* 3E-3F reserved */
126 126
127#define SDHCI_CAPABILITIES 0x40 127#define SDHCI_CAPABILITIES 0x40
128#define SDHCI_TIMEOUT_CLK_MASK 0x0000003F
129#define SDHCI_TIMEOUT_CLK_SHIFT 0
130#define SDHCI_TIMEOUT_CLK_UNIT 0x00000080
128#define SDHCI_CLOCK_BASE_MASK 0x00003F00 131#define SDHCI_CLOCK_BASE_MASK 0x00003F00
129#define SDHCI_CLOCK_BASE_SHIFT 8 132#define SDHCI_CLOCK_BASE_SHIFT 8
130#define SDHCI_CAN_DO_DMA 0x00400000 133#define SDHCI_CAN_DO_DMA 0x00400000
@@ -156,6 +159,7 @@ struct sdhci_host {
156#define SDHCI_USE_DMA (1<<0) 159#define SDHCI_USE_DMA (1<<0)
157 160
158 unsigned int max_clk; /* Max possible freq (MHz) */ 161 unsigned int max_clk; /* Max possible freq (MHz) */
162 unsigned int timeout_clk; /* Timeout freq (KHz) */
159 163
160 unsigned int clock; /* Current clock (MHz) */ 164 unsigned int clock; /* Current clock (MHz) */
161 unsigned short power; /* Current voltage */ 165 unsigned short power; /* Current voltage */