diff options
| author | Santosh Shilimkar <santosh.shilimkar@ti.com> | 2010-02-18 08:59:10 +0000 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-02-23 10:57:41 -0800 |
| commit | 737daa036081ad3030268f658d8dff785b3e73cd (patch) | |
| tree | 952b49eebf70dd2caf8c2e63cd23885a524c2b59 /arch | |
| parent | 35c0dc389d42c3d8c20ecdf0829fe9e935084b10 (diff) | |
| download | blackbird-op-linux-737daa036081ad3030268f658d8dff785b3e73cd.tar.gz blackbird-op-linux-737daa036081ad3030268f658d8dff785b3e73cd.zip | |
omap4: Fix omap_type() for omap4
This patch fixes the omap_type function to detect whether the device
is GP or HS
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Reviewed-by: Kevin Hilman <khilman@deeprootsystems.com>
Reviewed-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-omap2/id.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-omap/include/plat/control.h | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index 9e7c4aeeae02..e73f7e4ffdcf 100644 --- a/arch/arm/mach-omap2/id.c +++ b/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/arch/arm/plat-omap/include/plat/control.h b/arch/arm/plat-omap/include/plat/control.h index 207447399ad3..a56deee97676 100644 --- a/arch/arm/plat-omap/include/plat/control.h +++ b/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. |
