diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-07-09 13:01:00 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-07-23 16:25:13 +0200 |
| commit | ca13a84ac2580d8507f292b469751a919af60411 (patch) | |
| tree | 8cc52c2a7520bdd0d1f0b8c8175e4862503abc77 /drivers/mci/mxs.c | |
| parent | 66891566ccf72c19c3c25182f98eda4dc2a8ad3e (diff) | |
| download | barebox-ca13a84ac2580d8507f292b469751a919af60411.tar.gz barebox-ca13a84ac2580d8507f292b469751a919af60411.tar.xz | |
ARM: MXS: introduce stmp device support
MXS specific devices have some common infrastructure in the kernel
known as STMP devices. We have the same in barebox, but with a
mxs_ prefix instead of a stmp_ prefix. As some STMP devices are
also found on i.MX6 move the common infrastructure out of MXS
specific files and use the stmp_ prefix.
This is done in preparation for i.MX6 NAND support.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/mci/mxs.c')
| -rw-r--r-- | drivers/mci/mxs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mci/mxs.c b/drivers/mci/mxs.c index 023f92236a..1b935f7ce6 100644 --- a/drivers/mci/mxs.c +++ b/drivers/mci/mxs.c @@ -36,10 +36,10 @@ #include <errno.h> #include <clock.h> #include <io.h> +#include <stmp-device.h> #include <linux/clk.h> #include <linux/err.h> #include <asm/bitops.h> -#include <mach/mxs.h> #include <mach/imx-regs.h> #include <mach/mci.h> #include <mach/clock.h> @@ -457,7 +457,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_reset_block(mxs_mci->regs + HW_SSP_CTRL0, 0); + stmp_reset_block(mxs_mci->regs + HW_SSP_CTRL0, 0); /* restore the last settings */ mxs_mci_setup_timeout(mxs_mci, 0xffff); |