diff options
author | Kevin Hilman <khilman@ti.com> | 2012-04-30 19:37:10 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-05-10 12:39:42 -0400 |
commit | 68a88b9887d7f22645f99f2712fa8c450be374b5 (patch) | |
tree | e4427fe28eaa30aa6ff923cf94bb21f6b1b38ec5 /arch/arm/mach-omap2/id.c | |
parent | 3410773013432aced860f6f12def4fe9da517167 (diff) |
ARM: OMAP: AM35xx: convert 3517 detection/flags to AM35xx
Currently cpu_is_omap3517() actually detects any device in the AM35x
family (3517 and no-SGX version 3505.) To make it more clear what is
being detected, convert the names from 3517 to AM35xx.
This adds a new soc_is_am35xx() which duplicates the cpu_is_omap3517().
In order to avoid cross-tree dependencies with clock-tree changes,
cpu_is_omap3517() is left until the clock changes are merged,
at which point cpu_is_omap3517() will be completely removed.
Acked-by: Vaibhav Hiremath <hvaibhav@ti.com>
Tested-by: Vaibhav Hiremath <hvaibhav@ti.com>
Tested-by: Mark A. Greer <mgreer@animalcreek.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
[tony@atomide.com: change to use soc_is_omap instead]
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.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index 0e79b7bc6aa..f611e309715 100644 --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c | |||
@@ -185,8 +185,7 @@ static void __init omap3_cpuinfo(void) | |||
185 | */ | 185 | */ |
186 | if (cpu_is_omap3630()) { | 186 | if (cpu_is_omap3630()) { |
187 | cpu_name = "OMAP3630"; | 187 | cpu_name = "OMAP3630"; |
188 | } else if (cpu_is_omap3517()) { | 188 | } else if (soc_is_am35xx()) { |
189 | /* AM35xx devices */ | ||
190 | cpu_name = (omap3_has_sgx()) ? "AM3517" : "AM3505"; | 189 | cpu_name = (omap3_has_sgx()) ? "AM3517" : "AM3505"; |
191 | } else if (cpu_is_ti816x()) { | 190 | } else if (cpu_is_ti816x()) { |
192 | cpu_name = "TI816X"; | 191 | cpu_name = "TI816X"; |
@@ -352,13 +351,13 @@ void __init omap3xxx_check_revision(void) | |||
352 | */ | 351 | */ |
353 | switch (rev) { | 352 | switch (rev) { |
354 | case 0: | 353 | case 0: |
355 | omap_revision = OMAP3517_REV_ES1_0; | 354 | omap_revision = AM35XX_REV_ES1_0; |
356 | cpu_rev = "1.0"; | 355 | cpu_rev = "1.0"; |
357 | break; | 356 | break; |
358 | case 1: | 357 | case 1: |
359 | /* FALLTHROUGH */ | 358 | /* FALLTHROUGH */ |
360 | default: | 359 | default: |
361 | omap_revision = OMAP3517_REV_ES1_1; | 360 | omap_revision = AM35XX_REV_ES1_1; |
362 | cpu_rev = "1.1"; | 361 | cpu_rev = "1.1"; |
363 | } | 362 | } |
364 | break; | 363 | break; |