aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-msm/include
diff options
context:
space:
mode:
authorAlexander Tarasikov <alexander.tarasikov@gmail.com>2011-08-21 07:52:44 -0400
committerChris Ball <cjb@laptop.org>2011-10-26 15:43:36 -0400
commite91957e70d2aea529ff2055b8fbd575f2d7b8c3b (patch)
tree0ca76c59c04fcc10ad803b4b1312754670ed707b /arch/arm/mach-msm/include
parent435f3e385962e2b34855e9b34f8b95717c1016a2 (diff)
msm: Implement init_card operation for MSM SDCC
This allows boards with non-standard sdio cards to fill the CIS/CCCR data. It is particularly important for old msm72k boards using wl1251. Also drop the obsolete embedded_sdio_data structure from the header as it was intended to surve a similiar purpose but was not implemented. Signed-off-by: Alexander Tarasikov <alexander.tarasikov@gmail.com> Acked-by: Sahitya Tummala <stummala@codeaurora.org> [davidb: minor formatting cleanup] Signed-off-by: David Brown <davidb@codeaurora.org> Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'arch/arm/mach-msm/include')
-rw-r--r--arch/arm/mach-msm/include/mach/mmc.h9
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/arm/mach-msm/include/mach/mmc.h b/arch/arm/mach-msm/include/mach/mmc.h
index 5631b51cec46..ffcd9e3a6a7e 100644
--- a/arch/arm/mach-msm/include/mach/mmc.h
+++ b/arch/arm/mach-msm/include/mach/mmc.h
@@ -8,13 +8,6 @@
8#include <linux/mmc/card.h> 8#include <linux/mmc/card.h>
9#include <linux/mmc/sdio_func.h> 9#include <linux/mmc/sdio_func.h>
10 10
11struct embedded_sdio_data {
12 struct sdio_cis cis;
13 struct sdio_cccr cccr;
14 struct sdio_embedded_func *funcs;
15 int num_funcs;
16};
17
18struct msm_mmc_gpio { 11struct msm_mmc_gpio {
19 unsigned no; 12 unsigned no;
20 const char *name; 13 const char *name;
@@ -29,9 +22,9 @@ struct msm_mmc_platform_data {
29 unsigned int ocr_mask; /* available voltages */ 22 unsigned int ocr_mask; /* available voltages */
30 u32 (*translate_vdd)(struct device *, unsigned int); 23 u32 (*translate_vdd)(struct device *, unsigned int);
31 unsigned int (*status)(struct device *); 24 unsigned int (*status)(struct device *);
32 struct embedded_sdio_data *embedded_sdio;
33 int (*register_status_notify)(void (*callback)(int card_present, void *dev_id), void *dev_id); 25 int (*register_status_notify)(void (*callback)(int card_present, void *dev_id), void *dev_id);
34 struct msm_mmc_gpio_data *gpio_data; 26 struct msm_mmc_gpio_data *gpio_data;
27 void (*init_card)(struct mmc_card *card);
35}; 28};
36 29
37#endif 30#endif