diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-12-06 08:23:24 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-12-06 08:23:24 +0100 |
| commit | e9ea6eeaabb15258dbeefe06a421fca8c2fe9baa (patch) | |
| tree | 075fbf70c17a50190c3fb290eb6b362177f0d1e5 /drivers/mci | |
| parent | 18aa86831ed72380b7c2edba3c27bbf7a999da76 (diff) | |
| parent | 1e7f2bd25c28b36c7c40ed4797b2a21cc4e1502e (diff) | |
| download | barebox-e9ea6eeaabb15258dbeefe06a421fca8c2fe9baa.tar.gz barebox-e9ea6eeaabb15258dbeefe06a421fca8c2fe9baa.tar.xz | |
Merge branch 'for-next/misc'
Conflicts:
scripts/Makefile
Diffstat (limited to 'drivers/mci')
| -rw-r--r-- | drivers/mci/imx-esdhc.c | 1 | ||||
| -rw-r--r-- | drivers/mci/mci-core.c | 3 | ||||
| -rw-r--r-- | drivers/mci/mxs.c | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/drivers/mci/imx-esdhc.c b/drivers/mci/imx-esdhc.c index 8da7097c43..7664e7be4c 100644 --- a/drivers/mci/imx-esdhc.c +++ b/drivers/mci/imx-esdhc.c @@ -24,6 +24,7 @@ #include <common.h> #include <driver.h> #include <init.h> +#include <of.h> #include <malloc.h> #include <mci.h> #include <clock.h> diff --git a/drivers/mci/mci-core.c b/drivers/mci/mci-core.c index cfae91b2ea..a232679571 100644 --- a/drivers/mci/mci-core.c +++ b/drivers/mci/mci-core.c @@ -34,6 +34,7 @@ #include <asm/byteorder.h> #include <block.h> #include <disks.h> +#include <of.h> #include <linux/err.h> #define MAX_BUFFER_NUMBER 0xffffffff @@ -831,7 +832,7 @@ static void mci_extract_card_capacity_from_csd(struct mci *mci) mci->capacity = (csize + 1) << (cmult + 2); } - mci->capacity *= 1 << UNSTUFF_BITS(mci->csd, 80, 4);; + mci->capacity *= 1 << UNSTUFF_BITS(mci->csd, 80, 4); dev_dbg(&mci->dev, "Capacity: %u MiB\n", (unsigned)(mci->capacity >> 20)); } 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)) |