From c8e044faae4b8949fa1eae488fd128735face105 Mon Sep 17 00:00:00 2001 From: Santosh Shilimkar Date: Thu, 18 Feb 2010 08:59:10 +0000 Subject: [PATCH] --- yaml --- r: 184769 b: refs/heads/master c: 737daa036081ad3030268f658d8dff785b3e73cd h: refs/heads/master i: 184767: b57ce44f5999565628cca56fa064ebcbdca94d00 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/id.c | 2 ++ trunk/arch/arm/plat-omap/include/plat/control.h | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 3116f3f6eed3..f67b7d4ab2ea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 35c0dc389d42c3d8c20ecdf0829fe9e935084b10 +refs/heads/master: 737daa036081ad3030268f658d8dff785b3e73cd diff --git a/trunk/arch/arm/mach-omap2/id.c b/trunk/arch/arm/mach-omap2/id.c index 9e7c4aeeae02..e73f7e4ffdcf 100644 --- a/trunk/arch/arm/mach-omap2/id.c +++ b/trunk/arch/arm/mach-omap2/id.c @@ -57,6 +57,8 @@ int omap_type(void) val = omap_ctrl_readl(OMAP24XX_CONTROL_STATUS); } else if (cpu_is_omap34xx()) { val = omap_ctrl_readl(OMAP343X_CONTROL_STATUS); + } else if (cpu_is_omap44xx()) { + val = omap_ctrl_readl(OMAP44XX_CONTROL_STATUS); } else { pr_err("Cannot detect omap type!\n"); goto out; diff --git a/trunk/arch/arm/plat-omap/include/plat/control.h b/trunk/arch/arm/plat-omap/include/plat/control.h index 207447399ad3..a56deee97676 100644 --- a/trunk/arch/arm/plat-omap/include/plat/control.h +++ b/trunk/arch/arm/plat-omap/include/plat/control.h @@ -204,6 +204,9 @@ #define OMAP3_PADCONF_SAD2D_MSTANDBY 0x250 #define OMAP3_PADCONF_SAD2D_IDLEACK 0x254 +/* 44xx control status register offset */ +#define OMAP44XX_CONTROL_STATUS 0x2c4 + /* * REVISIT: This list of registers is not comprehensive - there are more * that should be added.