diff options
| author | Teresa Gámez <t.gamez@phytec.de> | 2013-10-02 08:22:30 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-10-02 10:26:17 +0200 |
| commit | 363843eba770c17ccd882d5ae0f3c5e747ae256f (patch) | |
| tree | f7d4238ec0da61876241305a0c356289f357fe45 /drivers | |
| parent | 34129cbd76537be5098bf2ee2f992b8fb1c648f9 (diff) | |
| download | barebox-363843eba770c17ccd882d5ae0f3c5e747ae256f.tar.gz barebox-363843eba770c17ccd882d5ae0f3c5e747ae256f.tar.xz | |
mci: omap: Fix default value of mci.f_max
With commit c2ef47887 mci.f_max default value is
only set when pdata is available.
Fix this with always setting the mci.f_max default
value and overrite it when pdata available.
Signed-off-by: Teresa Gámez <t.gamez@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mci/omap_hsmmc.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/mci/omap_hsmmc.c b/drivers/mci/omap_hsmmc.c index a2cd3fec59..19db461e0d 100644 --- a/drivers/mci/omap_hsmmc.c +++ b/drivers/mci/omap_hsmmc.c @@ -609,19 +609,17 @@ static int omap_mmc_probe(struct device_d *dev) hsmmc->mci.voltages = MMC_VDD_32_33 | MMC_VDD_33_34; hsmmc->mci.f_min = 400000; + hsmmc->mci.f_max = 52000000; pdata = (struct omap_hsmmc_platform_data *)dev->platform_data; if (pdata) { if (pdata->f_max) hsmmc->mci.f_max = pdata->f_max; - else - hsmmc->mci.f_max = 52000000; if (pdata->devname) hsmmc->mci.devname = pdata->devname; } - dev->priv = hsmmc; dev->detect = omap_mmc_detect, |