Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81032e34 authored by Vishal Mahaveer's avatar Vishal Mahaveer Committed by Tony Lindgren
Browse files

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: default avatarVishal Mahaveer <vishalm@ti.com>
Signed-off-by: default avatarNishanth Menon <nm@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 05f4f1ab

arch/arm/mach-omap2/id.c

+6 −2
Original line number Original line Diff line number Diff line
@@ -653,8 +653,12 @@ void __init dra7xxx_check_revision(void) 
			omap_revision = DRA752_REV_ES1_0;

			omap_revision = DRA752_REV_ES1_0;

			break;

			break;

		case 1:

		case 1:

		default:

			omap_revision = DRA752_REV_ES1_1;

			omap_revision = DRA752_REV_ES1_1;

			break;

		case 2:

		default:

			omap_revision = DRA752_REV_ES2_0;

			break;

		}

		}

		break;

		break;
@@ -674,7 +678,7 @@ void __init dra7xxx_check_revision(void) 
		/* Unknown default to latest silicon rev as default*/

		/* Unknown default to latest silicon rev as default*/

		pr_warn("%s: unknown idcode=0x%08x (hawkeye=0x%08x,rev=0x%x)\n",

		pr_warn("%s: unknown idcode=0x%08x (hawkeye=0x%08x,rev=0x%x)\n",

			__func__, idcode, hawkeye, rev);

			__func__, idcode, hawkeye, rev);

		omap_revision = DRA752_REV_ES1_1;

		omap_revision = DRA752_REV_ES2_0;

	}

	}





	sprintf(soc_name, "DRA%03x", omap_rev() >> 16);

	sprintf(soc_name, "DRA%03x", omap_rev() >> 16);

arch/arm/mach-omap2/soc.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -469,6 +469,8 @@ IS_OMAP_TYPE(3430, 0x3430) 
#define DRA7XX_CLASS		0x07000000

#define DRA7XX_CLASS		0x07000000

#define DRA752_REV_ES1_0	(DRA7XX_CLASS | (0x52 << 16) | (0x10 << 8))

#define DRA752_REV_ES1_0	(DRA7XX_CLASS | (0x52 << 16) | (0x10 << 8))

#define DRA752_REV_ES1_1	(DRA7XX_CLASS | (0x52 << 16) | (0x11 << 8))

#define DRA752_REV_ES1_1	(DRA7XX_CLASS | (0x52 << 16) | (0x11 << 8))

#define DRA752_REV_ES2_0	(DRA7XX_CLASS | (0x52 << 16) | (0x20 << 8))

#define DRA722_REV_ES1_0	(DRA7XX_CLASS | (0x22 << 16) | (0x10 << 8))

#define DRA722_REV_ES1_0	(DRA7XX_CLASS | (0x22 << 16) | (0x10 << 8))

#define DRA722_REV_ES1_0	(DRA7XX_CLASS | (0x22 << 16) | (0x10 << 8))





void omap2xxx_check_revision(void);

void omap2xxx_check_revision(void);