aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-msm/board-trout-mmc.c2
-rw-r--r--arch/arm/mach-msm/devices-msm7x00.c3
-rw-r--r--arch/arm/mach-msm/include/mach/board.h3
-rw-r--r--arch/arm/mach-msm/include/mach/mmc.h2
4 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/mach-msm/board-trout-mmc.c b/arch/arm/mach-msm/board-trout-mmc.c
index 0ba3e92e7493..44be8464657b 100644
--- a/arch/arm/mach-msm/board-trout-mmc.c
+++ b/arch/arm/mach-msm/board-trout-mmc.c
@@ -160,7 +160,7 @@ static unsigned int trout_sdslot_status(struct device *dev)
160 | MMC_VDD_25_26 | MMC_VDD_26_27 | MMC_VDD_27_28 \ 160 | MMC_VDD_25_26 | MMC_VDD_26_27 | MMC_VDD_27_28 \
161 | MMC_VDD_28_29 | MMC_VDD_29_30 161 | MMC_VDD_28_29 | MMC_VDD_29_30
162 162
163static struct mmc_platform_data trout_sdslot_data = { 163static struct msm_mmc_platform_data trout_sdslot_data = {
164 .ocr_mask = TROUT_MMC_VDD, 164 .ocr_mask = TROUT_MMC_VDD,
165 .status = trout_sdslot_status, 165 .status = trout_sdslot_status,
166 .translate_vdd = trout_sdslot_switchvdd, 166 .translate_vdd = trout_sdslot_switchvdd,
diff --git a/arch/arm/mach-msm/devices-msm7x00.c b/arch/arm/mach-msm/devices-msm7x00.c
index fde9d8f69f10..4e8c0bcdc92d 100644
--- a/arch/arm/mach-msm/devices-msm7x00.c
+++ b/arch/arm/mach-msm/devices-msm7x00.c
@@ -322,7 +322,8 @@ static struct platform_device *msm_sdcc_devices[] __initdata = {
322 &msm_device_sdc4, 322 &msm_device_sdc4,
323}; 323};
324 324
325int __init msm_add_sdcc(unsigned int controller, struct mmc_platform_data *plat, 325int __init msm_add_sdcc(unsigned int controller,
326 struct msm_mmc_platform_data *plat,
326 unsigned int stat_irq, unsigned long stat_irq_flags) 327 unsigned int stat_irq, unsigned long stat_irq_flags)
327{ 328{
328 struct platform_device *pdev; 329 struct platform_device *pdev;
diff --git a/arch/arm/mach-msm/include/mach/board.h b/arch/arm/mach-msm/include/mach/board.h
index a3efb0dc6dd6..5a79bcf50413 100644
--- a/arch/arm/mach-msm/include/mach/board.h
+++ b/arch/arm/mach-msm/include/mach/board.h
@@ -41,7 +41,8 @@ void __init msm_init_irq(void);
41void __init msm_init_gpio(void); 41void __init msm_init_gpio(void);
42void __init msm_clock_init(struct clk *clock_tbl, unsigned num_clocks); 42void __init msm_clock_init(struct clk *clock_tbl, unsigned num_clocks);
43void __init msm_acpu_clock_init(struct msm_acpu_clock_platform_data *); 43void __init msm_acpu_clock_init(struct msm_acpu_clock_platform_data *);
44int __init msm_add_sdcc(unsigned int controller, struct mmc_platform_data *plat, 44int __init msm_add_sdcc(unsigned int controller,
45 struct msm_mmc_platform_data *plat,
45 unsigned int stat_irq, unsigned long stat_irq_flags); 46 unsigned int stat_irq, unsigned long stat_irq_flags);
46 47
47#endif 48#endif
diff --git a/arch/arm/mach-msm/include/mach/mmc.h b/arch/arm/mach-msm/include/mach/mmc.h
index 0ecf25426284..d54b6b086cff 100644
--- a/arch/arm/mach-msm/include/mach/mmc.h
+++ b/arch/arm/mach-msm/include/mach/mmc.h
@@ -15,7 +15,7 @@ struct embedded_sdio_data {
15 int num_funcs; 15 int num_funcs;
16}; 16};
17 17
18struct mmc_platform_data { 18struct msm_mmc_platform_data {
19 unsigned int ocr_mask; /* available voltages */ 19 unsigned int ocr_mask; /* available voltages */
20 u32 (*translate_vdd)(struct device *, unsigned int); 20 u32 (*translate_vdd)(struct device *, unsigned int);
21 unsigned int (*status)(struct device *); 21 unsigned int (*status)(struct device *);