diff options
-rw-r--r-- | arch/arm/mach-omap2/id.c | 8 | ||||
-rw-r--r-- | arch/arm/mach-omap2/soc.h | 1 |
2 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index 0f4c18e6e60c..9bc5a18794f9 100644 --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c | |||
@@ -419,11 +419,15 @@ void __init omap3xxx_check_revision(void) | |||
419 | cpu_rev = "1.0"; | 419 | cpu_rev = "1.0"; |
420 | break; | 420 | break; |
421 | case 1: | 421 | case 1: |
422 | /* FALLTHROUGH */ | ||
423 | default: | ||
424 | omap_revision = AM335X_REV_ES2_0; | 422 | omap_revision = AM335X_REV_ES2_0; |
425 | cpu_rev = "2.0"; | 423 | cpu_rev = "2.0"; |
426 | break; | 424 | break; |
425 | case 2: | ||
426 | /* FALLTHROUGH */ | ||
427 | default: | ||
428 | omap_revision = AM335X_REV_ES2_1; | ||
429 | cpu_rev = "2.1"; | ||
430 | break; | ||
427 | } | 431 | } |
428 | break; | 432 | break; |
429 | case 0xb8f2: | 433 | case 0xb8f2: |
diff --git a/arch/arm/mach-omap2/soc.h b/arch/arm/mach-omap2/soc.h index ea89594b7afa..197cc16870d9 100644 --- a/arch/arm/mach-omap2/soc.h +++ b/arch/arm/mach-omap2/soc.h | |||
@@ -396,6 +396,7 @@ IS_OMAP_TYPE(3430, 0x3430) | |||
396 | #define AM335X_CLASS 0x33500033 | 396 | #define AM335X_CLASS 0x33500033 |
397 | #define AM335X_REV_ES1_0 AM335X_CLASS | 397 | #define AM335X_REV_ES1_0 AM335X_CLASS |
398 | #define AM335X_REV_ES2_0 (AM335X_CLASS | (0x1 << 8)) | 398 | #define AM335X_REV_ES2_0 (AM335X_CLASS | (0x1 << 8)) |
399 | #define AM335X_REV_ES2_1 (AM335X_CLASS | (0x2 << 8)) | ||
399 | 400 | ||
400 | #define OMAP443X_CLASS 0x44300044 | 401 | #define OMAP443X_CLASS 0x44300044 |
401 | #define OMAP4430_REV_ES1_0 (OMAP443X_CLASS | (0x10 << 8)) | 402 | #define OMAP4430_REV_ES1_0 (OMAP443X_CLASS | (0x10 << 8)) |