diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-05-06 09:30:28 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-05-06 09:30:28 +0200 |
| commit | 646a0d058dd206ee978803aaeb53c886cbc5ad9f (patch) | |
| tree | 72bda73406b8a1394f8e2422110bfe9665ff4456 /drivers/mci/mxs.c | |
| parent | 18ffa4da98185f8c5044b381779bf8d6303242c8 (diff) | |
| parent | 93c90a9636fa508736f0247937c3090f5371b5ac (diff) | |
| download | barebox-646a0d058dd206ee978803aaeb53c886cbc5ad9f.tar.gz barebox-646a0d058dd206ee978803aaeb53c886cbc5ad9f.tar.xz | |
Merge branch 'for-next/mxs'
Diffstat (limited to 'drivers/mci/mxs.c')
| -rw-r--r-- | drivers/mci/mxs.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/drivers/mci/mxs.c b/drivers/mci/mxs.c index 7f428150f8..c15461cf40 100644 --- a/drivers/mci/mxs.c +++ b/drivers/mci/mxs.c @@ -37,6 +37,7 @@ #include <clock.h> #include <io.h> #include <asm/bitops.h> +#include <mach/mxs.h> #include <mach/imx-regs.h> #include <mach/mci.h> #include <mach/clock.h> @@ -446,19 +447,6 @@ static unsigned mxs_mci_setup_clock_speed(struct mxs_mci_host *mxs_mci, unsigned return ssp / div / rate; } -/** - * Reset the MCI engine (the hard way) - * @param hw_dev Host interface instance - * - * This will reset everything in all registers of this unit! (FIXME) - */ -static void mxs_mci_reset(struct mxs_mci_host *mxs_mci) -{ - writel(SSP_CTRL0_SFTRST, mxs_mci->regs + HW_SSP_CTRL0 + 8); - while (readl(mxs_mci->regs + HW_SSP_CTRL0) & SSP_CTRL0_SFTRST) - ; -} - /* ------------------------- MCI API -------------------------------------- */ /** @@ -475,7 +463,7 @@ static int mxs_mci_initialize(struct mci_host *host, struct device_d *mci_dev) writel(SSP_CTRL0_CLKGATE, mxs_mci->regs + HW_SSP_CTRL0 + 8); /* reset the unit */ - mxs_mci_reset(mxs_mci); + mxs_reset_block(mxs_mci->regs + HW_SSP_CTRL0, 0); /* restore the last settings */ mxs_mci_setup_timeout(mxs_mci, 0xffff); |