[PATCH] ARM: OMAP: Add omap34xx revision detection for ES3.1.1

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



ARM: OMAP: Add omap34xx revision detection for ES3.1.1

- Add omap34xx revision detection for ES3.1.1 silicon.
- Change default silicon to ES3.1.1

- Also minor bug-fix: ES2.0 rev field is 1, not 0.
  - This means that ES2.0 silicon would have wrongly been
    detected as unknown

Signed-off-by: Anand Gadiyar <gadiyar@xxxxxx>
---
Let me know if this should be split into a bug-fix patch,
and a separate patch for adding ES 3.1.1 revision info.
I felt the change was too minor to split out, since
ES2.0 silicon is rare.

This patch is against linus' tree - so the cpu.h
change will apply with an offset

 arch/arm/mach-omap2/id.c              |    8 ++++++--
 arch/arm/plat-omap/include/mach/cpu.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 a98201c..414c520 100644
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -185,7 +185,7 @@ void __init omap34xx_check_revision(void)
 
 	if (hawkeye == 0xb7ae) {
 		switch (rev) {
-		case 0:
+		case 1:
 			omap_revision = OMAP3430_REV_ES2_0;
 			rev_name = "ES2.0";
 			break;
@@ -201,9 +201,13 @@ void __init omap34xx_check_revision(void)
 			omap_revision = OMAP3430_REV_ES3_1;
 			rev_name = "ES3.1";
 			break;
+		case 6:
+			omap_revision = OMAP3430_REV_ES3_1_1;
+			rev_name = "ES3.1.1";
+			break;
 		default:
 			/* Use the latest known revision as default */
-			omap_revision = OMAP3430_REV_ES3_1;
+			omap_revision = OMAP3430_REV_ES3_1_1;
 			rev_name = "Unknown revision\n";
 		}
 	}
diff --git a/arch/arm/plat-omap/include/mach/cpu.h b/arch/arm/plat-omap/include/mach/cpu.h
index 11e73d9..22cceb8 100644
--- a/arch/arm/plat-omap/include/mach/cpu.h
+++ b/arch/arm/plat-omap/include/mach/cpu.h
@@ -392,6 +392,7 @@ IS_OMAP_TYPE(3430, 0x3430)
 #define OMAP3430_REV_ES2_1	0x34302034
 #define OMAP3430_REV_ES3_0	0x34303034
 #define OMAP3430_REV_ES3_1	0x34304034
+#define OMAP3430_REV_ES3_1_1	0x34306034
 
 #define OMAP443X_CLASS		0x44300034
 
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Arm (vger)]     [ARM Kernel]     [ARM MSM]     [Linux Tegra]     [Linux WPAN Networking]     [Linux Wireless Networking]     [Maemo Users]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Trails]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux