aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--drivers/mmc/at91_mci.c1
-rw-r--r--drivers/mmc/au1xmmc.c1
-rw-r--r--drivers/mmc/imxmmc.c1
-rw-r--r--drivers/mmc/mmci.c1
-rw-r--r--drivers/mmc/omap.c1
-rw-r--r--drivers/mmc/pxamci.c1
-rw-r--r--drivers/mmc/sdhci.c1
-rw-r--r--drivers/mmc/tifm_sd.c1
-rw-r--r--drivers/mmc/wbsd.c1
-rw-r--r--include/asm-arm/arch-imx/mmc.h2
-rw-r--r--include/asm-arm/arch-pxa/mmc.h2
-rw-r--r--include/asm-arm/mach/mmc.h2
-rw-r--r--include/linux/mmc/host.h25
-rw-r--r--include/linux/mmc/protocol.h27
14 files changed, 31 insertions, 36 deletions
diff --git a/drivers/mmc/at91_mci.c b/drivers/mmc/at91_mci.c
index 459f4b4feded..e37943c314cb 100644
--- a/drivers/mmc/at91_mci.c
+++ b/drivers/mmc/at91_mci.c
@@ -67,7 +67,6 @@
67#include <linux/atmel_pdc.h> 67#include <linux/atmel_pdc.h>
68 68
69#include <linux/mmc/host.h> 69#include <linux/mmc/host.h>
70#include <linux/mmc/protocol.h>
71 70
72#include <asm/io.h> 71#include <asm/io.h>
73#include <asm/irq.h> 72#include <asm/irq.h>
diff --git a/drivers/mmc/au1xmmc.c b/drivers/mmc/au1xmmc.c
index b834be261ab7..b7156a4555b5 100644
--- a/drivers/mmc/au1xmmc.c
+++ b/drivers/mmc/au1xmmc.c
@@ -42,7 +42,6 @@
42#include <linux/dma-mapping.h> 42#include <linux/dma-mapping.h>
43 43
44#include <linux/mmc/host.h> 44#include <linux/mmc/host.h>
45#include <linux/mmc/protocol.h>
46#include <asm/io.h> 45#include <asm/io.h>
47#include <asm/mach-au1x00/au1000.h> 46#include <asm/mach-au1x00/au1000.h>
48#include <asm/mach-au1x00/au1xxx_dbdma.h> 47#include <asm/mach-au1x00/au1xxx_dbdma.h>
diff --git a/drivers/mmc/imxmmc.c b/drivers/mmc/imxmmc.c
index 0de5c9e94e74..7ee2045acbef 100644
--- a/drivers/mmc/imxmmc.c
+++ b/drivers/mmc/imxmmc.c
@@ -41,7 +41,6 @@
41#include <linux/dma-mapping.h> 41#include <linux/dma-mapping.h>
42#include <linux/mmc/host.h> 42#include <linux/mmc/host.h>
43#include <linux/mmc/card.h> 43#include <linux/mmc/card.h>
44#include <linux/mmc/protocol.h>
45#include <linux/delay.h> 44#include <linux/delay.h>
46 45
47#include <asm/dma.h> 46#include <asm/dma.h>
diff --git a/drivers/mmc/mmci.c b/drivers/mmc/mmci.c
index 5941dd951e82..d11c2d23ceea 100644
--- a/drivers/mmc/mmci.c
+++ b/drivers/mmc/mmci.c
@@ -17,7 +17,6 @@
17#include <linux/err.h> 17#include <linux/err.h>
18#include <linux/highmem.h> 18#include <linux/highmem.h>
19#include <linux/mmc/host.h> 19#include <linux/mmc/host.h>
20#include <linux/mmc/protocol.h>
21#include <linux/amba/bus.h> 20#include <linux/amba/bus.h>
22#include <linux/clk.h> 21#include <linux/clk.h>
23 22
diff --git a/drivers/mmc/omap.c b/drivers/mmc/omap.c
index 1e96a2f65022..e851384e51f4 100644
--- a/drivers/mmc/omap.c
+++ b/drivers/mmc/omap.c
@@ -22,7 +22,6 @@
22#include <linux/spinlock.h> 22#include <linux/spinlock.h>
23#include <linux/timer.h> 23#include <linux/timer.h>
24#include <linux/mmc/host.h> 24#include <linux/mmc/host.h>
25#include <linux/mmc/protocol.h>
26#include <linux/mmc/card.h> 25#include <linux/mmc/card.h>
27#include <linux/clk.h> 26#include <linux/clk.h>
28 27
diff --git a/drivers/mmc/pxamci.c b/drivers/mmc/pxamci.c
index 9774fc68b61a..a98ff98fa567 100644
--- a/drivers/mmc/pxamci.c
+++ b/drivers/mmc/pxamci.c
@@ -24,7 +24,6 @@
24#include <linux/interrupt.h> 24#include <linux/interrupt.h>
25#include <linux/dma-mapping.h> 25#include <linux/dma-mapping.h>
26#include <linux/mmc/host.h> 26#include <linux/mmc/host.h>
27#include <linux/mmc/protocol.h>
28 27
29#include <asm/dma.h> 28#include <asm/dma.h>
30#include <asm/io.h> 29#include <asm/io.h>
diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
index 587dccf95f8e..579142a7904b 100644
--- a/drivers/mmc/sdhci.c
+++ b/drivers/mmc/sdhci.c
@@ -15,7 +15,6 @@
15#include <linux/dma-mapping.h> 15#include <linux/dma-mapping.h>
16 16
17#include <linux/mmc/host.h> 17#include <linux/mmc/host.h>
18#include <linux/mmc/protocol.h>
19 18
20#include <asm/scatterlist.h> 19#include <asm/scatterlist.h>
21 20
diff --git a/drivers/mmc/tifm_sd.c b/drivers/mmc/tifm_sd.c
index f692a2ec09c5..b0d77d298412 100644
--- a/drivers/mmc/tifm_sd.c
+++ b/drivers/mmc/tifm_sd.c
@@ -13,7 +13,6 @@
13 13
14 14
15#include <linux/tifm.h> 15#include <linux/tifm.h>
16#include <linux/mmc/protocol.h>
17#include <linux/mmc/host.h> 16#include <linux/mmc/host.h>
18#include <linux/highmem.h> 17#include <linux/highmem.h>
19#include <linux/scatterlist.h> 18#include <linux/scatterlist.h>
diff --git a/drivers/mmc/wbsd.c b/drivers/mmc/wbsd.c
index 673c64661d36..9f7518b37c33 100644
--- a/drivers/mmc/wbsd.c
+++ b/drivers/mmc/wbsd.c
@@ -33,7 +33,6 @@
33#include <linux/pnp.h> 33#include <linux/pnp.h>
34#include <linux/highmem.h> 34#include <linux/highmem.h>
35#include <linux/mmc/host.h> 35#include <linux/mmc/host.h>
36#include <linux/mmc/protocol.h>
37 36
38#include <asm/io.h> 37#include <asm/io.h>
39#include <asm/dma.h> 38#include <asm/dma.h>
diff --git a/include/asm-arm/arch-imx/mmc.h b/include/asm-arm/arch-imx/mmc.h
index 1937151665c7..84c726934ace 100644
--- a/include/asm-arm/arch-imx/mmc.h
+++ b/include/asm-arm/arch-imx/mmc.h
@@ -1,7 +1,7 @@
1#ifndef ASMARM_ARCH_MMC_H 1#ifndef ASMARM_ARCH_MMC_H
2#define ASMARM_ARCH_MMC_H 2#define ASMARM_ARCH_MMC_H
3 3
4#include <linux/mmc/protocol.h> 4#include <linux/mmc/host.h>
5 5
6struct imxmmc_platform_data { 6struct imxmmc_platform_data {
7 int (*card_present)(void); 7 int (*card_present)(void);
diff --git a/include/asm-arm/arch-pxa/mmc.h b/include/asm-arm/arch-pxa/mmc.h
index a38a28c4bbd8..ef4f570381d1 100644
--- a/include/asm-arm/arch-pxa/mmc.h
+++ b/include/asm-arm/arch-pxa/mmc.h
@@ -1,7 +1,7 @@
1#ifndef ASMARM_ARCH_MMC_H 1#ifndef ASMARM_ARCH_MMC_H
2#define ASMARM_ARCH_MMC_H 2#define ASMARM_ARCH_MMC_H
3 3
4#include <linux/mmc/protocol.h> 4#include <linux/mmc/host.h>
5#include <linux/interrupt.h> 5#include <linux/interrupt.h>
6 6
7struct device; 7struct device;
diff --git a/include/asm-arm/mach/mmc.h b/include/asm-arm/mach/mmc.h
index 1b3555d4b41e..eb91145c00c4 100644
--- a/include/asm-arm/mach/mmc.h
+++ b/include/asm-arm/mach/mmc.h
@@ -4,7 +4,7 @@
4#ifndef ASMARM_MACH_MMC_H 4#ifndef ASMARM_MACH_MMC_H
5#define ASMARM_MACH_MMC_H 5#define ASMARM_MACH_MMC_H
6 6
7#include <linux/mmc/protocol.h> 7#include <linux/mmc/host.h>
8 8
9struct mmc_platform_data { 9struct mmc_platform_data {
10 unsigned int ocr_mask; /* available voltages */ 10 unsigned int ocr_mask; /* available voltages */
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index bfcef8a1ad8b..c89f41091304 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -88,6 +88,31 @@ struct mmc_host {
88 unsigned int f_max; 88 unsigned int f_max;
89 u32 ocr_avail; 89 u32 ocr_avail;
90 90
91#define MMC_VDD_145_150 0x00000001 /* VDD voltage 1.45 - 1.50 */
92#define MMC_VDD_150_155 0x00000002 /* VDD voltage 1.50 - 1.55 */
93#define MMC_VDD_155_160 0x00000004 /* VDD voltage 1.55 - 1.60 */
94#define MMC_VDD_160_165 0x00000008 /* VDD voltage 1.60 - 1.65 */
95#define MMC_VDD_165_170 0x00000010 /* VDD voltage 1.65 - 1.70 */
96#define MMC_VDD_17_18 0x00000020 /* VDD voltage 1.7 - 1.8 */
97#define MMC_VDD_18_19 0x00000040 /* VDD voltage 1.8 - 1.9 */
98#define MMC_VDD_19_20 0x00000080 /* VDD voltage 1.9 - 2.0 */
99#define MMC_VDD_20_21 0x00000100 /* VDD voltage 2.0 ~ 2.1 */
100#define MMC_VDD_21_22 0x00000200 /* VDD voltage 2.1 ~ 2.2 */
101#define MMC_VDD_22_23 0x00000400 /* VDD voltage 2.2 ~ 2.3 */
102#define MMC_VDD_23_24 0x00000800 /* VDD voltage 2.3 ~ 2.4 */
103#define MMC_VDD_24_25 0x00001000 /* VDD voltage 2.4 ~ 2.5 */
104#define MMC_VDD_25_26 0x00002000 /* VDD voltage 2.5 ~ 2.6 */
105#define MMC_VDD_26_27 0x00004000 /* VDD voltage 2.6 ~ 2.7 */
106#define MMC_VDD_27_28 0x00008000 /* VDD voltage 2.7 ~ 2.8 */
107#define MMC_VDD_28_29 0x00010000 /* VDD voltage 2.8 ~ 2.9 */
108#define MMC_VDD_29_30 0x00020000 /* VDD voltage 2.9 ~ 3.0 */
109#define MMC_VDD_30_31 0x00040000 /* VDD voltage 3.0 ~ 3.1 */
110#define MMC_VDD_31_32 0x00080000 /* VDD voltage 3.1 ~ 3.2 */
111#define MMC_VDD_32_33 0x00100000 /* VDD voltage 3.2 ~ 3.3 */
112#define MMC_VDD_33_34 0x00200000 /* VDD voltage 3.3 ~ 3.4 */
113#define MMC_VDD_34_35 0x00400000 /* VDD voltage 3.4 ~ 3.5 */
114#define MMC_VDD_35_36 0x00800000 /* VDD voltage 3.5 ~ 3.6 */
115
91 unsigned long caps; /* Host capabilities */ 116 unsigned long caps; /* Host capabilities */
92 117
93#define MMC_CAP_4_BIT_DATA (1 << 0) /* Can the host do 4 bit transfers */ 118#define MMC_CAP_4_BIT_DATA (1 << 0) /* Can the host do 4 bit transfers */
diff --git a/include/linux/mmc/protocol.h b/include/linux/mmc/protocol.h
index d740ab94fa25..3ca91a6fc23f 100644
--- a/include/linux/mmc/protocol.h
+++ b/include/linux/mmc/protocol.h
@@ -208,30 +208,9 @@ struct _mmc_csd {
208 u8 ecc; 208 u8 ecc;
209}; 209};
210 210
211#define MMC_VDD_145_150 0x00000001 /* VDD voltage 1.45 - 1.50 */ 211/*
212#define MMC_VDD_150_155 0x00000002 /* VDD voltage 1.50 - 1.55 */ 212 * OCR bits are mostly in host.h
213#define MMC_VDD_155_160 0x00000004 /* VDD voltage 1.55 - 1.60 */ 213 */
214#define MMC_VDD_160_165 0x00000008 /* VDD voltage 1.60 - 1.65 */
215#define MMC_VDD_165_170 0x00000010 /* VDD voltage 1.65 - 1.70 */
216#define MMC_VDD_17_18 0x00000020 /* VDD voltage 1.7 - 1.8 */
217#define MMC_VDD_18_19 0x00000040 /* VDD voltage 1.8 - 1.9 */
218#define MMC_VDD_19_20 0x00000080 /* VDD voltage 1.9 - 2.0 */
219#define MMC_VDD_20_21 0x00000100 /* VDD voltage 2.0 ~ 2.1 */
220#define MMC_VDD_21_22 0x00000200 /* VDD voltage 2.1 ~ 2.2 */
221#define MMC_VDD_22_23 0x00000400 /* VDD voltage 2.2 ~ 2.3 */
222#define MMC_VDD_23_24 0x00000800 /* VDD voltage 2.3 ~ 2.4 */
223#define MMC_VDD_24_25 0x00001000 /* VDD voltage 2.4 ~ 2.5 */
224#define MMC_VDD_25_26 0x00002000 /* VDD voltage 2.5 ~ 2.6 */
225#define MMC_VDD_26_27 0x00004000 /* VDD voltage 2.6 ~ 2.7 */
226#define MMC_VDD_27_28 0x00008000 /* VDD voltage 2.7 ~ 2.8 */
227#define MMC_VDD_28_29 0x00010000 /* VDD voltage 2.8 ~ 2.9 */
228#define MMC_VDD_29_30 0x00020000 /* VDD voltage 2.9 ~ 3.0 */
229#define MMC_VDD_30_31 0x00040000 /* VDD voltage 3.0 ~ 3.1 */
230#define MMC_VDD_31_32 0x00080000 /* VDD voltage 3.1 ~ 3.2 */
231#define MMC_VDD_32_33 0x00100000 /* VDD voltage 3.2 ~ 3.3 */
232#define MMC_VDD_33_34 0x00200000 /* VDD voltage 3.3 ~ 3.4 */
233#define MMC_VDD_34_35 0x00400000 /* VDD voltage 3.4 ~ 3.5 */
234#define MMC_VDD_35_36 0x00800000 /* VDD voltage 3.5 ~ 3.6 */
235#define MMC_CARD_BUSY 0x80000000 /* Card Power up status bit */ 214#define MMC_CARD_BUSY 0x80000000 /* Card Power up status bit */
236 215
237/* 216/*
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-30 00:39:57 -0500