From 5ca8084ea969ca709b646f39118491ee50efe0d1 Mon Sep 17 00:00:00 2001 From: Daniel Mack Date: Mon, 15 Oct 2012 21:35:06 +0530 Subject: [PATCH] --- yaml --- r: 336274 b: refs/heads/master c: d8714e87b62b1c39ae8f3cef9a32121ad1c9a7ae h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/omap_hsmmc.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1feb7b031479..642aec5eeb65 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 46b76035c12140caeda64dfd2557557263a30039 +refs/heads/master: d8714e87b62b1c39ae8f3cef9a32121ad1c9a7ae diff --git a/trunk/drivers/mmc/host/omap_hsmmc.c b/trunk/drivers/mmc/host/omap_hsmmc.c index 813ae0ac6286..0b5e7ab92ef1 100644 --- a/trunk/drivers/mmc/host/omap_hsmmc.c +++ b/trunk/drivers/mmc/host/omap_hsmmc.c @@ -1679,7 +1679,7 @@ static struct omap_mmc_platform_data *of_get_hsmmc_pdata(struct device *dev) { struct omap_mmc_platform_data *pdata; struct device_node *np = dev->of_node; - u32 bus_width; + u32 bus_width, max_freq; pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL); if (!pdata) @@ -1706,6 +1706,9 @@ static struct omap_mmc_platform_data *of_get_hsmmc_pdata(struct device *dev) if (of_find_property(np, "ti,needs-special-reset", NULL)) pdata->slots[0].features |= HSMMC_HAS_UPDATED_RESET; + if (!of_property_read_u32(np, "max-frequency", &max_freq)) + pdata->max_freq = max_freq; + return pdata; } #else