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 /arch/arm/mach-mxs/imx.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 'arch/arm/mach-mxs/imx.c')
| -rw-r--r-- | arch/arm/mach-mxs/imx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-mxs/imx.c b/arch/arm/mach-mxs/imx.c index 9f195e4dd3..b7247b9b72 100644 --- a/arch/arm/mach-mxs/imx.c +++ b/arch/arm/mach-mxs/imx.c @@ -19,6 +19,7 @@ #include <complete.h> #include <init.h> #include <io.h> +#include <stmp-device.h> #include <mach/generic.h> #include <mach/imx-regs.h> @@ -39,7 +40,7 @@ static int imx_reset_usb_bootstrap(void) * To prevent this (and boot from the configured bootsource instead) * clear this bit here. */ - writel(0x2, IMX_WDT_BASE + HW_RTC_PERSISTENT1 + BIT_CLR); + writel(0x2, IMX_WDT_BASE + HW_RTC_PERSISTENT1 + STMP_OFFSET_REG_CLR); return 0; } |