Commit b5d643de authored by Sahitya Tummala's avatar Sahitya Tummala Committed by Daniel Walker

msm: mmc: Add msm prefix to platform data structure

Rename mmc_platform_data to msm_mmc_platform_data as it is used
only by MSM platform.
Signed-off-by: default avatarSahitya Tummala <stummala@codeaurora.org>
Signed-off-by: default avatarDaniel Walker <dwalker@codeaurora.org>
parent 28d6c3db
...@@ -160,7 +160,7 @@ static unsigned int trout_sdslot_status(struct device *dev) ...@@ -160,7 +160,7 @@ static unsigned int trout_sdslot_status(struct device *dev)
| MMC_VDD_25_26 | MMC_VDD_26_27 | MMC_VDD_27_28 \ | MMC_VDD_25_26 | MMC_VDD_26_27 | MMC_VDD_27_28 \
| MMC_VDD_28_29 | MMC_VDD_29_30 | MMC_VDD_28_29 | MMC_VDD_29_30
static struct mmc_platform_data trout_sdslot_data = { static struct msm_mmc_platform_data trout_sdslot_data = {
.ocr_mask = TROUT_MMC_VDD, .ocr_mask = TROUT_MMC_VDD,
.status = trout_sdslot_status, .status = trout_sdslot_status,
.translate_vdd = trout_sdslot_switchvdd, .translate_vdd = trout_sdslot_switchvdd,
......
...@@ -322,7 +322,8 @@ static struct platform_device *msm_sdcc_devices[] __initdata = { ...@@ -322,7 +322,8 @@ static struct platform_device *msm_sdcc_devices[] __initdata = {
&msm_device_sdc4, &msm_device_sdc4,
}; };
int __init msm_add_sdcc(unsigned int controller, struct mmc_platform_data *plat, int __init msm_add_sdcc(unsigned int controller,
struct msm_mmc_platform_data *plat,
unsigned int stat_irq, unsigned long stat_irq_flags) unsigned int stat_irq, unsigned long stat_irq_flags)
{ {
struct platform_device *pdev; struct platform_device *pdev;
......
...@@ -41,7 +41,8 @@ void __init msm_init_irq(void); ...@@ -41,7 +41,8 @@ void __init msm_init_irq(void);
void __init msm_init_gpio(void); void __init msm_init_gpio(void);
void __init msm_clock_init(struct clk *clock_tbl, unsigned num_clocks); void __init msm_clock_init(struct clk *clock_tbl, unsigned num_clocks);
void __init msm_acpu_clock_init(struct msm_acpu_clock_platform_data *); void __init msm_acpu_clock_init(struct msm_acpu_clock_platform_data *);
int __init msm_add_sdcc(unsigned int controller, struct mmc_platform_data *plat, int __init msm_add_sdcc(unsigned int controller,
struct msm_mmc_platform_data *plat,
unsigned int stat_irq, unsigned long stat_irq_flags); unsigned int stat_irq, unsigned long stat_irq_flags);
#endif #endif
...@@ -15,7 +15,7 @@ struct embedded_sdio_data { ...@@ -15,7 +15,7 @@ struct embedded_sdio_data {
int num_funcs; int num_funcs;
}; };
struct mmc_platform_data { struct msm_mmc_platform_data {
unsigned int ocr_mask; /* available voltages */ unsigned int ocr_mask; /* available voltages */
u32 (*translate_vdd)(struct device *, unsigned int); u32 (*translate_vdd)(struct device *, unsigned int);
unsigned int (*status)(struct device *); unsigned int (*status)(struct device *);
......
...@@ -1076,7 +1076,7 @@ do_resume_work(struct work_struct *work) ...@@ -1076,7 +1076,7 @@ do_resume_work(struct work_struct *work)
static int static int
msmsdcc_probe(struct platform_device *pdev) msmsdcc_probe(struct platform_device *pdev)
{ {
struct mmc_platform_data *plat = pdev->dev.platform_data; struct msm_mmc_platform_data *plat = pdev->dev.platform_data;
struct msmsdcc_host *host; struct msmsdcc_host *host;
struct mmc_host *mmc; struct mmc_host *mmc;
struct resource *cmd_irqres = NULL; struct resource *cmd_irqres = NULL;
......
...@@ -225,7 +225,7 @@ struct msmsdcc_host { ...@@ -225,7 +225,7 @@ struct msmsdcc_host {
u32 pwr; u32 pwr;
u32 saved_irq0mask; /* MMCIMASK0 reg value */ u32 saved_irq0mask; /* MMCIMASK0 reg value */
struct mmc_platform_data *plat; struct msm_mmc_platform_data *plat;
struct timer_list timer; struct timer_list timer;
unsigned int oldstat; unsigned int oldstat;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment