ARM: OMAP5: id: Remove ES1.0 support (aa2f4b16) · Commits · 戴 / test

OMAP5 ES1.0 was intended as a test chip and has major register level differences w.r.t ES2.0 revision of the chip. All register defines, dts support has been solely added for ES2.0 version of the chip. Further, all ES1.0 chips and platforms are supposed to have been removed from circulation. Hence, there is no need to further retain any resemblence of ES1.0 support in id detection code. Remove the omap_revision handling and BUG() instead to prevent folks who mistakenly try an older unsupported chip and report bogus errors. Signed-off-by:

Nishanth Menon <nm@ti.com> Acked-by:

Santosh Shilimkar <santosh.shilimkar@ti.com> Signed-off-by:

Tony Lindgren <tony@atomide.com>

arch/arm/mach-omap2/id.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -576,8 +576,8 @@ void __init omap5xxx_check_revision(void)
		case 0xb942:
		switch (rev) {
		case 0:
		omap_revision = OMAP5430_REV_ES1_0;
		break;
		/* No support for ES1.0 Test chip */
		BUG();
		case 1:
		default:
		omap_revision = OMAP5430_REV_ES2_0;
		@@ -587,8 +587,8 @@ void __init omap5xxx_check_revision(void)
		case 0xb998:
		switch (rev) {
		case 0:
		omap_revision = OMAP5432_REV_ES1_0;
		break;
		/* No support for ES1.0 Test chip */
		BUG();
		case 1:
		default:
		omap_revision = OMAP5432_REV_ES2_0;

arch/arm/mach-omap2/soc.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -455,9 +455,7 @@ IS_OMAP_TYPE(3430, 0x3430)
		#define OMAP4470_REV_ES1_0 (OMAP447X_CLASS \| (0x10 << 8))

		#define OMAP54XX_CLASS 0x54000054
		#define OMAP5430_REV_ES1_0 (OMAP54XX_CLASS \| (0x30 << 16) \| (0x10 << 8))
		#define OMAP5430_REV_ES2_0 (OMAP54XX_CLASS \| (0x30 << 16) \| (0x20 << 8))
		#define OMAP5432_REV_ES1_0 (OMAP54XX_CLASS \| (0x32 << 16) \| (0x10 << 8))
		#define OMAP5432_REV_ES2_0 (OMAP54XX_CLASS \| (0x32 << 16) \| (0x20 << 8))

		void omap2xxx_check_revision(void);

Admin message