diff options
| -rw-r--r-- | arch/arm/mach-mxs/include/mach/mci.h | 1 | ||||
| -rw-r--r-- | drivers/mci/mxs.c | 1 | ||||
| -rw-r--r-- | include/mci.h | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-mxs/include/mach/mci.h b/arch/arm/mach-mxs/include/mach/mci.h index 4faab37dab..c47c24cba8 100644 --- a/arch/arm/mach-mxs/include/mach/mci.h +++ b/arch/arm/mach-mxs/include/mach/mci.h @@ -15,6 +15,7 @@ #define __MACH_MMC_H struct mxs_mci_platform_data { + const char *devname; unsigned caps; /**< supported operating modes (MMC_MODE_*) */ unsigned voltages; /**< supported voltage range (MMC_VDD_*) */ unsigned f_min; /**< min operating frequency in Hz (0 -> no limit) */ diff --git a/drivers/mci/mxs.c b/drivers/mci/mxs.c index 1b935f7ce6..bf928e80ff 100644 --- a/drivers/mci/mxs.c +++ b/drivers/mci/mxs.c @@ -570,6 +570,7 @@ static int mxs_mci_probe(struct device_d *hw_dev) /* feed forward the platform specific values */ host->voltages = pd->voltages; host->host_caps = pd->caps; + host->devname = pd->devname; mxs_mci->clk = clk_get(hw_dev, NULL); if (IS_ERR(mxs_mci->clk)) diff --git a/include/mci.h b/include/mci.h index 07ac2731f7..0f10e8aea9 100644 --- a/include/mci.h +++ b/include/mci.h @@ -286,7 +286,7 @@ struct mci; struct mci_host { struct device_d *hw_dev; /**< the host MCI hardware device */ struct mci *mci; - char *devname; /**< the devicename for the card, defaults to disk%d */ + const char *devname; /**< the devicename for the card, defaults to disk%d */ unsigned voltages; unsigned host_caps; /**< Host's interface capabilities, refer MMC_VDD_* */ unsigned f_min; /**< host interface lower limit */ |