| Message ID | 1379513142-11125-1-git-send-email-nm@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wednesday 18 September 2013 10:05 AM, Nishanth Menon wrote: > 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. > > Cc: Santosh Shilimkar <santosh.shilimkar@ti.com> > Signed-off-by: Nishanth Menon <nm@ti.com> > --- > ref: http://marc.info/?l=linux-omap&m=137951198232339&w=2 > based on 3.12-rc1 tag > That was quick ... Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
* Santosh Shilimkar <santosh.shilimkar@ti.com> [130918 07:15]: > On Wednesday 18 September 2013 10:05 AM, Nishanth Menon wrote: > > 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. > > > > Cc: Santosh Shilimkar <santosh.shilimkar@ti.com> > > Signed-off-by: Nishanth Menon <nm@ti.com> > > --- > > ref: http://marc.info/?l=linux-omap&m=137951198232339&w=2 > > based on 3.12-rc1 tag > > > That was quick ... > Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Heh, it was made, but not supposed to be used, and still merged to mainline kernel.. I guess this is the way to deal with this issue as we don't have really any omap5 es1 support in place. So applying into omap-for-v3.13/soc branch. Tony
On Tuesday 08 October 2013 05:31 PM, Tony Lindgren wrote: > * Santosh Shilimkar <santosh.shilimkar@ti.com> [130918 07:15]: >> On Wednesday 18 September 2013 10:05 AM, Nishanth Menon wrote: >>> 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. >>> >>> Cc: Santosh Shilimkar <santosh.shilimkar@ti.com> >>> Signed-off-by: Nishanth Menon <nm@ti.com> >>> --- >>> ref: http://marc.info/?l=linux-omap&m=137951198232339&w=2 >>> based on 3.12-rc1 tag >>> >> That was quick ... >> Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com> > > Heh, it was made, but not supposed to be used, and still merged > to mainline kernel.. > You know the history. At least for this silicon we avoided tons of datafiles merges for ES1.0 which changed completely for ES2.0. At least during that period people had choice to merge the data-files based on the board they have to test out ;-) > I guess this is the way to deal with this issue as we don't have > really any omap5 es1 support in place. So applying into > omap-for-v3.13/soc branch. > Thanks !! Regards, Santosh
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index 0289adc..4f8f1cb 100644 --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c @@ -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; diff --git a/arch/arm/mach-omap2/soc.h b/arch/arm/mach-omap2/soc.h index 4588df1..076bd90 100644 --- a/arch/arm/mach-omap2/soc.h +++ b/arch/arm/mach-omap2/soc.h @@ -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);
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. Cc: Santosh Shilimkar <santosh.shilimkar@ti.com> Signed-off-by: Nishanth Menon <nm@ti.com> --- ref: http://marc.info/?l=linux-omap&m=137951198232339&w=2 based on 3.12-rc1 tag arch/arm/mach-omap2/id.c | 8 ++++---- arch/arm/mach-omap2/soc.h | 2 -- 2 files changed, 4 insertions(+), 6 deletions(-)