diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-02-08 15:49:14 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-02-09 12:40:11 +0100 |
| commit | 0f9892cce8792b2d44b07ba8431c2876290e1ac1 (patch) | |
| tree | d4efdfdf3a4a10849e0abcbdedbe78b5c421f4af /drivers/mci/imx.c | |
| parent | 74b83f91198c8dd81ba3afac2b83f10723bd39b5 (diff) | |
| download | barebox-0f9892cce8792b2d44b07ba8431c2876290e1ac1.tar.gz barebox-0f9892cce8792b2d44b07ba8431c2876290e1ac1.tar.xz | |
mci core: replace discrete ios values with struct ios
As we'll need more arguments to set_ios over time put them
in a struct mci_ios like the kernel does.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/mci/imx.c')
| -rw-r--r-- | drivers/mci/imx.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/drivers/mci/imx.c b/drivers/mci/imx.c index 50c98e1cef..2ce34bb471 100644 --- a/drivers/mci/imx.c +++ b/drivers/mci/imx.c @@ -442,23 +442,29 @@ static void mxcmci_set_clk_rate(struct mxcmci_host *host, unsigned int clk_ios) } static void mxcmci_set_ios(struct mci_host *mci, struct device_d *dev, - unsigned bus_width, unsigned clock) + struct mci_ios *ios) { struct mxcmci_host *host = to_mxcmci(mci); - if (bus_width == 4) + switch (ios->bus_width) { + case MMC_BUS_WIDTH_4: host->cmdat |= CMD_DAT_CONT_BUS_WIDTH_4; - else + break; + case MMC_BUS_WIDTH_1: host->cmdat &= ~CMD_DAT_CONT_BUS_WIDTH_4; + break; + default: + return; + } - if (clock) { - mxcmci_set_clk_rate(host, clock); + if (ios->clock) { + mxcmci_set_clk_rate(host, ios->clock); writew(STR_STP_CLK_START_CLK, &host->base->str_stp_clk); } else { writew(STR_STP_CLK_STOP_CLK, &host->base->str_stp_clk); } - host->clock = clock; + host->clock = ios->clock; } static int mxcmci_init(struct mci_host *mci, struct device_d *dev) |