|
@@ -1946,13 +1946,17 @@ MODULE_DEVICE_TABLE(of, omap_mmc_of_match);
|
|
|
|
|
|
static struct omap_hsmmc_platform_data *of_get_hsmmc_pdata(struct device *dev)
|
|
|
{
|
|
|
- struct omap_hsmmc_platform_data *pdata;
|
|
|
+ struct omap_hsmmc_platform_data *pdata, *legacy;
|
|
|
struct device_node *np = dev->of_node;
|
|
|
|
|
|
pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
|
|
|
if (!pdata)
|
|
|
return ERR_PTR(-ENOMEM); /* out of memory */
|
|
|
|
|
|
+ legacy = dev_get_platdata(dev);
|
|
|
+ if (legacy && legacy->name)
|
|
|
+ pdata->name = legacy->name;
|
|
|
+
|
|
|
if (of_find_property(np, "ti,dual-volt", NULL))
|
|
|
pdata->controller_flags |= OMAP_HSMMC_SUPPORTS_DUAL_VOLT;
|
|
|
|