[PATCH] ARM mxs: Clear USB boot mode during startup

[Sascha Hauer]

When the i.MX28 boots from USB, the ROM code sets this bit. When
after a reset the ROM code detects that this bit is set it will
boot from USB again. This means that if we boot once from USB the
chip will continue to boot from USB until the next power cycle.

To prevent this (and boot from the configured bootsource instead)
clear this bit here. This bit is not documented in the datasheets,
it was figured out the hard way. Whether this is the same on i.MX23
is currently not known.

Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
---
 arch/arm/mach-mxs/imx.c |   26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/arch/arm/mach-mxs/imx.c b/arch/arm/mach-mxs/imx.c
index c64f23c..63b8889 100644
--- a/arch/arm/mach-mxs/imx.c
+++ b/arch/arm/mach-mxs/imx.c
@@ -20,6 +20,32 @@
 #include <common.h>
 #include <command.h>
 #include <complete.h>
+#include <init.h>
+#include <io.h>
+#include <mach/imx-regs.h>
+
+#define HW_RTC_PERSISTENT1     0x070
+
+static int imx_reset_usb_bootstrap(void)
+{
+	/*
+	 * Clear USB boot mode.
+	 *
+	 * When the i.MX28 boots from USB, the ROM code sets this bit. When
+	 * after a reset the ROM code detects that this bit is set it will
+	 * boot from USB again. This means that if we boot once from USB the
+	 * chip will continue to boot from USB until the next power cycle.
+	 *
+	 * To prevent this (and boot from the configured bootsource instead)
+	 * clear this bit here. This bit is not documented in the datasheets,
+	 * it was figured out the hard way. Whether this is the same on i.MX23
+	 * is currently not known.
+	 */
+	writel(0x2, IMX_WDT_BASE + HW_RTC_PERSISTENT1 + BIT_CLR);
+
+	return 0;
+}
+device_initcall(imx_reset_usb_bootstrap);
 
 extern void imx_dump_clocks(void);
 
-- 
1.7.10