summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/id.c
diff options
context:
space:
mode:
authorAfzal Mohammed <afzal@ti.com>2012-03-05 16:11:01 -0800
committerTony Lindgren <tony@atomide.com>2012-03-05 16:11:01 -0800
commitfb3cfb1ff9745e0c3aab92cc141c1b353839b0ab (patch)
treece5911619f67f2994e1c50e0cb41e96820c07abb /arch/arm/mach-omap2/id.c
parentf611b020e74a41fb6460a5d5ca085d0c361b8b2f (diff)
downloadlinux-fb3cfb1ff9745e0c3aab92cc141c1b353839b0ab.tar.bz2
ARM: OMAP2+: id: Add am33xx SoC type detection
Determine SoC type, i.e. whether GP or HS Note: cpu_is_34xx() is true for am33xx also. Doing cpu_is_am33xx() check after cpu_is_34xx() will not achieve what we want due to the above reason. Hence cpu_is_am33xx() is done before cpu_is_34xx() Signed-off-by: Afzal Mohammed <afzal@ti.com> Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/id.c')
-rw-r--r--arch/arm/mach-omap2/id.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index 6c5826605eae..134739751107 100644
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -44,6 +44,8 @@ int omap_type(void)
if (cpu_is_omap24xx()) {
val = omap_ctrl_readl(OMAP24XX_CONTROL_STATUS);
+ } else if (cpu_is_am33xx()) {
+ val = omap_ctrl_readl(AM33XX_CONTROL_STATUS);
} else if (cpu_is_omap34xx()) {
val = omap_ctrl_readl(OMAP343X_CONTROL_STATUS);
} else if (cpu_is_omap44xx()) {