diff mbox

[v2,SRU,SAUCE,O/omap4] omap4: add 4430 ES2.3 support

Message ID 1327328321-8067-1-git-send-email-paolo.pisati@canonical.com
State New
Headers show

Commit Message

Paolo Pisati Jan. 23, 2012, 2:18 p.m. UTC 
From: Anand Gadiyar <gadiyar@ti.com>

And default to 4430 ES2.3 for unidentified silicon.

Signed-off-by: Anand Gadiyar <gadiyar@ti.com>

(partially backported from 55035c1524b5b48ac7d267167c4895f7831897ad)

BugLink: http://bugs.launchpad.net/bugs/917264

Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
---
 arch/arm/mach-omap2/id.c              |   10 +++++++---
 arch/arm/plat-omap/include/plat/cpu.h |   11 +++++++----
 2 files changed, 14 insertions(+), 7 deletions(-)

Comments

Tim Gardner Jan. 23, 2012, 3:03 p.m. UTC | #1
diff mbox

Patch

diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index fb63c92..847786a 100644
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -402,9 +402,13 @@  static void __init omap4_check_revision(void)
 			omap_chip.oc |= CHIP_IS_OMAP4430ES2_1;
 			break;
 		case 4:
-		default:
 			omap_revision = OMAP4430_REV_ES2_2;
 			omap_chip.oc |= CHIP_IS_OMAP4430ES2_2;
+			break;
+		case 6:
+		default:
+			omap_revision = OMAP4430_REV_ES2_3;
+			omap_chip.oc |= CHIP_IS_OMAP4430ES2_3;
 		}
 		break;
 	case 0xb94e:
@@ -422,8 +426,8 @@  static void __init omap4_check_revision(void)
 		break;
 	default:
 		/* Unknown default to latest silicon rev as default */
-		omap_revision = OMAP4430_REV_ES2_2;
-		omap_chip.oc |= CHIP_IS_OMAP4430ES2_2;
+		omap_revision = OMAP4430_REV_ES2_3;
+		omap_chip.oc |= CHIP_IS_OMAP4430ES2_3;
 	}
 
 	pr_info("OMAP%04x ES%d.%d\n", omap_rev() >> 16,
diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h
index d8a1602..263d4fa 100644
--- a/arch/arm/plat-omap/include/plat/cpu.h
+++ b/arch/arm/plat-omap/include/plat/cpu.h
@@ -414,6 +414,7 @@  IS_OMAP_TYPE(3517, 0x3517)
 #define OMAP4430_REV_ES2_0	(OMAP443X_CLASS | (0x20 << 8))
 #define OMAP4430_REV_ES2_1	(OMAP443X_CLASS | (0x21 << 8))
 #define OMAP4430_REV_ES2_2	(OMAP443X_CLASS | (0x22 << 8))
+#define OMAP4430_REV_ES2_3	(OMAP443X_CLASS | (0x23 << 8))
 
 #define OMAP446X_CLASS		0x44600044
 #define OMAP4460_REV_ES1_0	(OMAP446X_CLASS | (0x10 << 8))
@@ -447,16 +448,18 @@  IS_OMAP_TYPE(3517, 0x3517)
 #define CHIP_IS_OMAP4430ES2		(1 << 11)
 #define CHIP_IS_OMAP4430ES2_1		(1 << 12)
 #define CHIP_IS_OMAP4430ES2_2		(1 << 13)
-#define CHIP_IS_TI816X			(1 << 14)
-#define CHIP_IS_OMAP4460ES1_0		(1 << 15)
-#define CHIP_IS_OMAP4460ES1_1		(1 << 16)
+#define CHIP_IS_OMAP4430ES2_3		(1 << 14)
+#define CHIP_IS_TI816X			(1 << 15)
+#define CHIP_IS_OMAP4460ES1_0		(1 << 16)
+#define CHIP_IS_OMAP4460ES1_1		(1 << 17)
 
 #define CHIP_IS_OMAP24XX		(CHIP_IS_OMAP2420 | CHIP_IS_OMAP2430)
 
 #define CHIP_IS_OMAP443X		(CHIP_IS_OMAP4430ES1 |		\
 					 CHIP_IS_OMAP4430ES2 |		\
 					 CHIP_IS_OMAP4430ES2_1 |	\
-					 CHIP_IS_OMAP4430ES2_2)
+					 CHIP_IS_OMAP4430ES2_2 |	\
+					 CHIP_IS_OMAP4430ES2_3)
 
 #define CHIP_IS_OMAP446X		(CHIP_IS_OMAP4460ES1_0 |	\
 					 CHIP_IS_OMAP4460ES1_1)