diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-02-03 09:55:52 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-02-03 09:55:52 +0100 |
| commit | d3c96d65222b3ae99f03affda5ecd05fdb9873a4 (patch) | |
| tree | 1087466b3a6fd116c3ae775758f5510ace6bfed1 /drivers/mci/imx-esdhc.c | |
| parent | 4a53361beb278b110d1b73ca71398ecb7de54fed (diff) | |
| parent | 6b5f0d4c9a1789f517e12e3958ba20899db9a1f4 (diff) | |
| download | barebox-d3c96d65222b3ae99f03affda5ecd05fdb9873a4.tar.gz barebox-d3c96d65222b3ae99f03affda5ecd05fdb9873a4.tar.xz | |
Merge branch 'for-next/mci'
Conflicts:
arch/arm/boards/tqma53/board.c
Diffstat (limited to 'drivers/mci/imx-esdhc.c')
| -rw-r--r-- | drivers/mci/imx-esdhc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/mci/imx-esdhc.c b/drivers/mci/imx-esdhc.c index c5cf0ae52e..f5e78e0d79 100644 --- a/drivers/mci/imx-esdhc.c +++ b/drivers/mci/imx-esdhc.c @@ -582,6 +582,10 @@ static int fsl_esdhc_probe(struct device_d *dev) if (host->mci.f_min < 200000) host->mci.f_min = 200000; host->mci.f_max = rate; + if (pdata) { + host->mci.use_dsr = pdata->use_dsr; + host->mci.dsr_val = pdata->dsr_val; + } mci_of_parse(&host->mci); |