summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/imx1.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-imx/imx1.c')
-rw-r--r--arch/arm/mach-imx/imx1.c32
1 files changed, 31 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/imx1.c b/arch/arm/mach-imx/imx1.c
index 790e4535d7..18901ea6d0 100644
--- a/arch/arm/mach-imx/imx1.c
+++ b/arch/arm/mach-imx/imx1.c
@@ -14,8 +14,34 @@
#include <common.h>
#include <init.h>
#include <io.h>
-#include <mach/imx-regs.h>
+#include <mach/imx1-regs.h>
#include <mach/weim.h>
+#include <mach/iomux-v1.h>
+#include <reset_source.h>
+
+#define MX1_RSR MX1_SCM_BASE_ADDR
+#define RSR_EXR (1 << 0)
+#define RSR_WDR (1 << 1)
+
+static void imx1_detect_reset_source(void)
+{
+ u32 val = readl((void *)MX1_RSR) & 0x3;
+
+ switch (val) {
+ case RSR_EXR:
+ set_reset_source(RESET_RST);
+ return;
+ case RSR_WDR:
+ set_reset_source(RESET_WDG);
+ return;
+ case 0:
+ set_reset_source(RESET_POR);
+ return;
+ default:
+ /* else keep the default 'unknown' state */
+ return;
+ }
+}
void imx1_setup_eimcs(size_t cs, unsigned upper, unsigned lower)
{
@@ -25,12 +51,16 @@ void imx1_setup_eimcs(size_t cs, unsigned upper, unsigned lower)
static int imx1_init(void)
{
+ imx_iomuxv1_init((void *)MX1_GPIO1_BASE_ADDR);
+ imx1_detect_reset_source();
+
add_generic_device("imx1-ccm", 0, NULL, MX1_CCM_BASE_ADDR, 0x1000, IORESOURCE_MEM, NULL);
add_generic_device("imx1-gpt", 0, NULL, MX1_TIM1_BASE_ADDR, 0x100, IORESOURCE_MEM, NULL);
add_generic_device("imx1-gpio", 0, NULL, MX1_GPIO1_BASE_ADDR, 0x100, IORESOURCE_MEM, NULL);
add_generic_device("imx1-gpio", 1, NULL, MX1_GPIO2_BASE_ADDR, 0x100, IORESOURCE_MEM, NULL);
add_generic_device("imx1-gpio", 2, NULL, MX1_GPIO3_BASE_ADDR, 0x100, IORESOURCE_MEM, NULL);
add_generic_device("imx1-gpio", 3, NULL, MX1_GPIO4_BASE_ADDR, 0x100, IORESOURCE_MEM, NULL);
+ add_generic_device("imx1-wdt", 0, NULL, MX1_WDT_BASE_ADDR, 0x100, IORESOURCE_MEM, NULL);
return 0;
}