diff options
author | Vishal Mahaveer <vishalm@ti.com> | 2015-09-01 16:59:25 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2015-09-01 16:59:25 -0400 |
commit | 81032e34e184a8d63598d215a6d4a3352018ffea (patch) | |
tree | 004bc2d7d0b6995674445239b92c14f9e45d1843 | |
parent | 05f4f1abc274ac7e8e83424d0cef2d842db91815 (diff) |
ARM: DRA752: Add ID detect for ES2.0
ES2.0 is a minor variant of ES1.1. ES2.0 is an incremental revision
with various fixes including the following:
- reset logic fixes
- few assymetric aging logic fixes
- MMC clock rate fixes
- Ethernet speed fixes
- edma fixes for mcasp
NOTE: even though we use a compatible of dra742 and dra752, the usage in
the Linux kernel is more or less interchangable - we use dra752 more
often in the linux kernel compared to dra742 and 4.2-rc6
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r-- | arch/arm/mach-omap2/id.c | 8 | ||||
-rw-r--r-- | arch/arm/mach-omap2/soc.h | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index e3f713ffb06b..54a5ba54d2ff 100644 --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c | |||
@@ -653,8 +653,12 @@ void __init dra7xxx_check_revision(void) | |||
653 | omap_revision = DRA752_REV_ES1_0; | 653 | omap_revision = DRA752_REV_ES1_0; |
654 | break; | 654 | break; |
655 | case 1: | 655 | case 1: |
656 | default: | ||
657 | omap_revision = DRA752_REV_ES1_1; | 656 | omap_revision = DRA752_REV_ES1_1; |
657 | break; | ||
658 | case 2: | ||
659 | default: | ||
660 | omap_revision = DRA752_REV_ES2_0; | ||
661 | break; | ||
658 | } | 662 | } |
659 | break; | 663 | break; |
660 | 664 | ||
@@ -674,7 +678,7 @@ void __init dra7xxx_check_revision(void) | |||
674 | /* Unknown default to latest silicon rev as default*/ | 678 | /* Unknown default to latest silicon rev as default*/ |
675 | pr_warn("%s: unknown idcode=0x%08x (hawkeye=0x%08x,rev=0x%x)\n", | 679 | pr_warn("%s: unknown idcode=0x%08x (hawkeye=0x%08x,rev=0x%x)\n", |
676 | __func__, idcode, hawkeye, rev); | 680 | __func__, idcode, hawkeye, rev); |
677 | omap_revision = DRA752_REV_ES1_1; | 681 | omap_revision = DRA752_REV_ES2_0; |
678 | } | 682 | } |
679 | 683 | ||
680 | sprintf(soc_name, "DRA%03x", omap_rev() >> 16); | 684 | sprintf(soc_name, "DRA%03x", omap_rev() >> 16); |
diff --git a/arch/arm/mach-omap2/soc.h b/arch/arm/mach-omap2/soc.h index f97654d11ea5..2d1d3845253c 100644 --- a/arch/arm/mach-omap2/soc.h +++ b/arch/arm/mach-omap2/soc.h | |||
@@ -469,6 +469,8 @@ IS_OMAP_TYPE(3430, 0x3430) | |||
469 | #define DRA7XX_CLASS 0x07000000 | 469 | #define DRA7XX_CLASS 0x07000000 |
470 | #define DRA752_REV_ES1_0 (DRA7XX_CLASS | (0x52 << 16) | (0x10 << 8)) | 470 | #define DRA752_REV_ES1_0 (DRA7XX_CLASS | (0x52 << 16) | (0x10 << 8)) |
471 | #define DRA752_REV_ES1_1 (DRA7XX_CLASS | (0x52 << 16) | (0x11 << 8)) | 471 | #define DRA752_REV_ES1_1 (DRA7XX_CLASS | (0x52 << 16) | (0x11 << 8)) |
472 | #define DRA752_REV_ES2_0 (DRA7XX_CLASS | (0x52 << 16) | (0x20 << 8)) | ||
473 | #define DRA722_REV_ES1_0 (DRA7XX_CLASS | (0x22 << 16) | (0x10 << 8)) | ||
472 | #define DRA722_REV_ES1_0 (DRA7XX_CLASS | (0x22 << 16) | (0x10 << 8)) | 474 | #define DRA722_REV_ES1_0 (DRA7XX_CLASS | (0x22 << 16) | (0x10 << 8)) |
473 | 475 | ||
474 | void omap2xxx_check_revision(void); | 476 | void omap2xxx_check_revision(void); |