Skip to content

Commit

Permalink
omap4: Fix omap_type() for omap4
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Santosh Shilimkar authored and Tony Lindgren committed Feb 23, 2010
1 parent 35c0dc3 commit 737daa0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
2 changes: 2 additions & 0 deletions arch/arm/mach-omap2/id.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 3 additions & 0 deletions arch/arm/plat-omap/include/plat/control.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 737daa0

Please sign in to comment.