* Tony mostly offline for the rest of July @ 2010-07-08 10:00 Tony Lindgren 2010-07-08 17:37 ` Gadiyar, Anand 0 siblings, 1 reply; 13+ messages in thread From: Tony Lindgren @ 2010-07-08 10:00 UTC (permalink / raw) To: linux-omap, linux-arm-kernel Hi all, FYI, I'll be mostly offline after Friday for several weeks. I'll post few more patchsets for review, but will not be merging any other omap code after that for the upcoming merge window. Cheers, Tony ^ permalink raw reply [flat|nested] 13+ messages in thread
* RE: Tony mostly offline for the rest of July 2010-07-08 10:00 Tony mostly offline for the rest of July Tony Lindgren @ 2010-07-08 17:37 ` Gadiyar, Anand 2010-07-09 7:29 ` Tony Lindgren 0 siblings, 1 reply; 13+ messages in thread From: Gadiyar, Anand @ 2010-07-08 17:37 UTC (permalink / raw) To: Tony Lindgren, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org Tony Lindgren wrote: > Hi all, > > FYI, I'll be mostly offline after Friday for several weeks. > > I'll post few more patchsets for review, but will not be merging > any other omap code after that for the upcoming merge window. > > Cheers, > > Tony Tony, The 3630 ES1.1 ID code patch is pending in patchworks for a while [1]. I missed pinging you on this earlier. It would be nice to queue this up for the merge window as well. https://patchwork.kernel.org/patch/95684/ Also, we now have ES1.2 silicon as well; should I submit an updated patch now, or just a delta patch later? - Anand ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: Tony mostly offline for the rest of July 2010-07-08 17:37 ` Gadiyar, Anand @ 2010-07-09 7:29 ` Tony Lindgren 2010-07-09 23:17 ` [PATCH] OMAP3630: Add ES1.1 and ES1.2 detection Anand Gadiyar 0 siblings, 1 reply; 13+ messages in thread From: Tony Lindgren @ 2010-07-09 7:29 UTC (permalink / raw) To: Gadiyar, Anand Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org * Gadiyar, Anand <gadiyar@ti.com> [100708 20:31]: > Tony Lindgren wrote: > > Hi all, > > > > FYI, I'll be mostly offline after Friday for several weeks. > > > > I'll post few more patchsets for review, but will not be merging > > any other omap code after that for the upcoming merge window. > > > > Cheers, > > > > Tony > > Tony, > > The 3630 ES1.1 ID code patch is pending in patchworks for a while [1]. > > I missed pinging you on this earlier. It would be nice to queue this > up for the merge window as well. OK, that's good to have. > > https://patchwork.kernel.org/patch/95684/ > > > Also, we now have ES1.2 silicon as well; should I submit an updated > patch now, or just a delta patch later? Please reply to this thread with your updated patch. Also, we should not drop the default handling for unknown hawkeye registers. Regards, Tony ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH] OMAP3630: Add ES1.1 and ES1.2 detection 2010-07-09 7:29 ` Tony Lindgren @ 2010-07-09 23:17 ` Anand Gadiyar 2010-08-03 7:39 ` Tony Lindgren 0 siblings, 1 reply; 13+ messages in thread From: Anand Gadiyar @ 2010-07-09 23:17 UTC (permalink / raw) To: linux-omap; +Cc: Anand Gadiyar, Nishanth Menon, Manjunatha GK, Tony Lindgren Add revision detection for ES1.1 and ES1.2. Set default revision as ES1.2. Add CHIP_GE_OMAP3630ES1_1 to detect revisions 1.1 and later. This is needed for at least one feature that is broken in 3630ES1.0 but exists on older (3430 ES3.1) and newer revisions. Additionally, update some of the CHIP_GE_* macros to use other macros for ease of maintenance. Signed-off-by: Anand Gadiyar <gadiyar@ti.com> Cc: Nishanth Menon <nm@ti.com> Cc: Manjunatha GK <manjugk@ti.com> Cc: Tony Lindgren <tony@atomide.com> --- This is based on Manju's original patch at [1] and my update [2]. The original patch failed to properly update the CHIP_GE_OMAP3630ES1 macro. Would be nice to get this queued for the next merge window [1] https://patchwork.kernel.org/patch/95684/ [2] https://patchwork.kernel.org/patch/99590/ arch/arm/mach-omap2/id.c | 27 +++++++++++++++++++++++---- arch/arm/plat-omap/include/plat/cpu.h | 15 +++++++++++---- 2 files changed, 34 insertions(+), 8 deletions(-) Index: linux-omap-2.6/arch/arm/mach-omap2/id.c =================================================================== --- linux-omap-2.6.orig/arch/arm/mach-omap2/id.c +++ linux-omap-2.6/arch/arm/mach-omap2/id.c @@ -269,11 +269,24 @@ void __init omap3_check_revision(void) omap_chip.oc |= CHIP_IS_OMAP3430ES3_1; break; case 0xb891: - /* FALLTHROUGH */ - default: - /* Unknown default to latest silicon rev as default*/ - omap_revision = OMAP3630_REV_ES1_0; + /* Handle 36xx devices */ omap_chip.oc |= CHIP_IS_OMAP3630ES1; + + switch(rev) { + case 0: /* Take care of early samples */ + omap_revision = OMAP3630_REV_ES1_0; + break; + case 1: + omap_revision = OMAP3630_REV_ES1_1; + omap_chip.oc |= CHIP_IS_OMAP3630ES1_1; + break; + case 2: + /* Fall through */ + default: + /* Use the latest known revision as default */ + omap_revision = OMAP3630_REV_ES1_2; + omap_chip.oc |= CHIP_IS_OMAP3630ES1_2; + } } } @@ -349,6 +362,12 @@ void __init omap3_cpuinfo(void) case OMAP_REVBITS_00: strcpy(cpu_rev, "1.0"); break; + case OMAP_REVBITS_01: + strcpy(cpu_rev, "1.1"); + break; + case OMAP_REVBITS_02: + strcpy(cpu_rev, "1.2"); + break; case OMAP_REVBITS_10: strcpy(cpu_rev, "2.0"); break; Index: linux-omap-2.6/arch/arm/plat-omap/include/plat/cpu.h =================================================================== --- linux-omap-2.6.orig/arch/arm/plat-omap/include/plat/cpu.h +++ linux-omap-2.6/arch/arm/plat-omap/include/plat/cpu.h @@ -66,6 +66,8 @@ unsigned int omap_rev(void); * family. This difference can be handled separately. */ #define OMAP_REVBITS_00 0x00 +#define OMAP_REVBITS_01 0x01 +#define OMAP_REVBITS_02 0x02 #define OMAP_REVBITS_10 0x10 #define OMAP_REVBITS_20 0x20 #define OMAP_REVBITS_30 0x30 @@ -376,6 +378,8 @@ IS_OMAP_TYPE(3517, 0x3517) #define OMAP3430_REV_ES3_1_2 0x34305034 #define OMAP3630_REV_ES1_0 0x36300034 +#define OMAP3630_REV_ES1_1 0x36300134 +#define OMAP3630_REV_ES1_2 0x36300234 #define OMAP35XX_CLASS 0x35000034 #define OMAP3503_REV(v) (OMAP35XX_CLASS | (0x3503 << 16) | (v << 8)) @@ -411,6 +415,8 @@ IS_OMAP_TYPE(3517, 0x3517) #define CHIP_IS_OMAP3430ES3_1 (1 << 6) #define CHIP_IS_OMAP3630ES1 (1 << 7) #define CHIP_IS_OMAP4430ES1 (1 << 8) +#define CHIP_IS_OMAP3630ES1_1 (1 << 9) +#define CHIP_IS_OMAP3630ES1_2 (1 << 10) #define CHIP_IS_OMAP24XX (CHIP_IS_OMAP2420 | CHIP_IS_OMAP2430) @@ -424,11 +430,12 @@ IS_OMAP_TYPE(3517, 0x3517) */ #define CHIP_GE_OMAP3430ES2 (CHIP_IS_OMAP3430ES2 | \ CHIP_IS_OMAP3430ES3_0 | \ - CHIP_IS_OMAP3430ES3_1 | \ - CHIP_IS_OMAP3630ES1) + CHIP_GE_OMAP3430ES3_1) #define CHIP_GE_OMAP3430ES3_1 (CHIP_IS_OMAP3430ES3_1 | \ - CHIP_IS_OMAP3630ES1) - + CHIP_IS_OMAP3630ES1 | \ + CHIP_GE_OMAP3630ES1_1) +#define CHIP_GE_OMAP3630ES1_1 (CHIP_IS_OMAP3630ES1_1 | \ + CHIP_IS_OMAP3630ES1_2) int omap_chip_is(struct omap_chip_id oci); void omap2_check_revision(void); ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] OMAP3630: Add ES1.1 and ES1.2 detection 2010-07-09 23:17 ` [PATCH] OMAP3630: Add ES1.1 and ES1.2 detection Anand Gadiyar @ 2010-08-03 7:39 ` Tony Lindgren 2010-08-03 7:43 ` Gadiyar, Anand 2010-08-03 19:59 ` [PATCH v2] " Anand Gadiyar 0 siblings, 2 replies; 13+ messages in thread From: Tony Lindgren @ 2010-08-03 7:39 UTC (permalink / raw) To: Anand Gadiyar; +Cc: linux-omap, Nishanth Menon, Manjunatha GK * Anand Gadiyar <gadiyar@ti.com> [100710 02:11]: > Add revision detection for ES1.1 and ES1.2. Set default > revision as ES1.2. > > Add CHIP_GE_OMAP3630ES1_1 to detect revisions 1.1 and later. > This is needed for at least one feature that is broken in > 3630ES1.0 but exists on older (3430 ES3.1) and newer revisions. > > Additionally, update some of the CHIP_GE_* macros to use other > macros for ease of maintenance. > > Signed-off-by: Anand Gadiyar <gadiyar@ti.com> > Cc: Nishanth Menon <nm@ti.com> > Cc: Manjunatha GK <manjugk@ti.com> > Cc: Tony Lindgren <tony@atomide.com> > --- > This is based on Manju's original patch at [1] and my update [2]. > The original patch failed to properly update the CHIP_GE_OMAP3630ES1 macro. > > Would be nice to get this queued for the next merge window > > [1] https://patchwork.kernel.org/patch/95684/ > [2] https://patchwork.kernel.org/patch/99590/ > > arch/arm/mach-omap2/id.c | 27 +++++++++++++++++++++++---- > arch/arm/plat-omap/include/plat/cpu.h | 15 +++++++++++---- > 2 files changed, 34 insertions(+), 8 deletions(-) > > Index: linux-omap-2.6/arch/arm/mach-omap2/id.c > =================================================================== > --- linux-omap-2.6.orig/arch/arm/mach-omap2/id.c > +++ linux-omap-2.6/arch/arm/mach-omap2/id.c > @@ -269,11 +269,24 @@ void __init omap3_check_revision(void) > omap_chip.oc |= CHIP_IS_OMAP3430ES3_1; > break; > case 0xb891: > - /* FALLTHROUGH */ > - default: > - /* Unknown default to latest silicon rev as default*/ > - omap_revision = OMAP3630_REV_ES1_0; > + /* Handle 36xx devices */ > omap_chip.oc |= CHIP_IS_OMAP3630ES1; > + > + switch(rev) { > + case 0: /* Take care of early samples */ > + omap_revision = OMAP3630_REV_ES1_0; > + break; > + case 1: > + omap_revision = OMAP3630_REV_ES1_1; > + omap_chip.oc |= CHIP_IS_OMAP3630ES1_1; > + break; > + case 2: > + /* Fall through */ > + default: > + /* Use the latest known revision as default */ > + omap_revision = OMAP3630_REV_ES1_2; > + omap_chip.oc |= CHIP_IS_OMAP3630ES1_2; > + } > } > } Please don't remove the default handling for unknown hawkeye registers for omap3. Now you're only handling hawkeye 0xb891. IMHO, setting unknown hawkeye chips to OMAP3630_REV_ES1_2 should be still best option for future chips. Regards, Tony ^ permalink raw reply [flat|nested] 13+ messages in thread
* RE: [PATCH] OMAP3630: Add ES1.1 and ES1.2 detection 2010-08-03 7:39 ` Tony Lindgren @ 2010-08-03 7:43 ` Gadiyar, Anand 2010-08-03 19:59 ` [PATCH v2] " Anand Gadiyar 1 sibling, 0 replies; 13+ messages in thread From: Gadiyar, Anand @ 2010-08-03 7:43 UTC (permalink / raw) To: Tony Lindgren Cc: linux-omap@vger.kernel.org, Menon, Nishanth, G, Manjunath Kondaiah Tony Lindgren wrote: > * Anand Gadiyar <gadiyar@ti.com> [100710 02:11]: > > Add revision detection for ES1.1 and ES1.2. Set default > > revision as ES1.2. > > > > Add CHIP_GE_OMAP3630ES1_1 to detect revisions 1.1 and later. > > This is needed for at least one feature that is broken in > > 3630ES1.0 but exists on older (3430 ES3.1) and newer revisions. > > > > Additionally, update some of the CHIP_GE_* macros to use other > > macros for ease of maintenance. > > > > Signed-off-by: Anand Gadiyar <gadiyar@ti.com> > > Cc: Nishanth Menon <nm@ti.com> > > Cc: Manjunatha GK <manjugk@ti.com> > > Cc: Tony Lindgren <tony@atomide.com> > > --- > > This is based on Manju's original patch at [1] and my update [2]. > > The original patch failed to properly update the CHIP_GE_OMAP3630ES1 macro. > > > > Would be nice to get this queued for the next merge window > > > > [1] https://patchwork.kernel.org/patch/95684/ > > [2] https://patchwork.kernel.org/patch/99590/ > > > > arch/arm/mach-omap2/id.c | 27 +++++++++++++++++++++++---- > > arch/arm/plat-omap/include/plat/cpu.h | 15 +++++++++++---- > > 2 files changed, 34 insertions(+), 8 deletions(-) > > > > Index: linux-omap-2.6/arch/arm/mach-omap2/id.c > > =================================================================== > > --- linux-omap-2.6.orig/arch/arm/mach-omap2/id.c > > +++ linux-omap-2.6/arch/arm/mach-omap2/id.c > > @@ -269,11 +269,24 @@ void __init omap3_check_revision(void) > > omap_chip.oc |= CHIP_IS_OMAP3430ES3_1; > > break; > > case 0xb891: > > - /* FALLTHROUGH */ > > - default: > > - /* Unknown default to latest silicon rev as default*/ > > - omap_revision = OMAP3630_REV_ES1_0; > > + /* Handle 36xx devices */ > > omap_chip.oc |= CHIP_IS_OMAP3630ES1; > > + > > + switch(rev) { > > + case 0: /* Take care of early samples */ > > + omap_revision = OMAP3630_REV_ES1_0; > > + break; > > + case 1: > > + omap_revision = OMAP3630_REV_ES1_1; > > + omap_chip.oc |= CHIP_IS_OMAP3630ES1_1; > > + break; > > + case 2: > > + /* Fall through */ > > + default: > > + /* Use the latest known revision as default */ > > + omap_revision = OMAP3630_REV_ES1_2; > > + omap_chip.oc |= CHIP_IS_OMAP3630ES1_2; > > + } > > } > > } > > Please don't remove the default handling for unknown hawkeye > registers for omap3. Now you're only handling hawkeye 0xb891. > > IMHO, setting unknown hawkeye chips to OMAP3630_REV_ES1_2 > should be still best option for future chips. > > Regards, > > Tony Ouch. That was an accident. I'll repost in a bit. - Anand ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v2] OMAP3630: Add ES1.1 and ES1.2 detection 2010-08-03 7:39 ` Tony Lindgren 2010-08-03 7:43 ` Gadiyar, Anand @ 2010-08-03 19:59 ` Anand Gadiyar 2010-08-04 10:30 ` Tony Lindgren 1 sibling, 1 reply; 13+ messages in thread From: Anand Gadiyar @ 2010-08-03 19:59 UTC (permalink / raw) To: linux-omap; +Cc: Anand Gadiyar, Nishanth Menon, Manjunatha GK, Tony Lindgren Add revision detection for ES1.1 and ES1.2. Set default revision as ES1.2. Add CHIP_GE_OMAP3630ES1_1 to detect revisions 1.1 and later. This is needed for at least one feature that is broken in 3630ES1.0 but exists on older (3430 ES3.1) and newer revisions. Additionally, update some of the CHIP_GE_* macros to use other macros for ease of maintenance. Signed-off-by: Anand Gadiyar <gadiyar@ti.com> Cc: Nishanth Menon <nm@ti.com> Cc: Manjunatha GK <manjugk@ti.com> Cc: Tony Lindgren <tony@atomide.com> --- v2: Fixed accidental removal of default handling, and minor update of a comment. This is based on Manju's original patch at [1] and my update [2]. The original patch failed to properly update the CHIP_GE_OMAP3630ES1 macro. Would be nice to get this queued for the next merge window [1] https://patchwork.kernel.org/patch/95684/ [2] https://patchwork.kernel.org/patch/99590/ arch/arm/mach-omap2/id.c | 27 +++++++++++++++++++++++++-- arch/arm/plat-omap/include/plat/cpu.h | 15 +++++++++++---- 2 files changed, 36 insertions(+), 6 deletions(-) Index: linux-2.6/arch/arm/mach-omap2/id.c =================================================================== --- linux-2.6.orig/arch/arm/mach-omap2/id.c +++ linux-2.6/arch/arm/mach-omap2/id.c @@ -261,9 +261,26 @@ void __init omap3_check_revision(void) case 0xb891: /* FALLTHROUGH */ default: - /* Unknown default to latest silicon rev as default*/ - omap_revision = OMAP3630_REV_ES1_0; + /* Unknown hawkeye defaults to latest silicon revision */ + + /* Handle 36xx devices */ omap_chip.oc |= CHIP_IS_OMAP3630ES1; + + switch(rev) { + case 0: /* Take care of early samples */ + omap_revision = OMAP3630_REV_ES1_0; + break; + case 1: + omap_revision = OMAP3630_REV_ES1_1; + omap_chip.oc |= CHIP_IS_OMAP3630ES1_1; + break; + case 2: + /* Fall through */ + default: + /* Use the latest known revision as default */ + omap_revision = OMAP3630_REV_ES1_2; + omap_chip.oc |= CHIP_IS_OMAP3630ES1_2; + } } } @@ -339,6 +356,12 @@ void __init omap3_cpuinfo(void) case OMAP_REVBITS_00: strcpy(cpu_rev, "1.0"); break; + case OMAP_REVBITS_01: + strcpy(cpu_rev, "1.1"); + break; + case OMAP_REVBITS_02: + strcpy(cpu_rev, "1.2"); + break; case OMAP_REVBITS_10: strcpy(cpu_rev, "2.0"); break; Index: linux-2.6/arch/arm/plat-omap/include/plat/cpu.h =================================================================== --- linux-2.6.orig/arch/arm/plat-omap/include/plat/cpu.h +++ linux-2.6/arch/arm/plat-omap/include/plat/cpu.h @@ -66,6 +66,8 @@ unsigned int omap_rev(void); * family. This difference can be handled separately. */ #define OMAP_REVBITS_00 0x00 +#define OMAP_REVBITS_01 0x01 +#define OMAP_REVBITS_02 0x02 #define OMAP_REVBITS_10 0x10 #define OMAP_REVBITS_20 0x20 #define OMAP_REVBITS_30 0x30 @@ -376,6 +378,8 @@ IS_OMAP_TYPE(3517, 0x3517) #define OMAP3430_REV_ES3_1_2 0x34305034 #define OMAP3630_REV_ES1_0 0x36300034 +#define OMAP3630_REV_ES1_1 0x36300134 +#define OMAP3630_REV_ES1_2 0x36300234 #define OMAP35XX_CLASS 0x35000034 #define OMAP3503_REV(v) (OMAP35XX_CLASS | (0x3503 << 16) | (v << 8)) @@ -411,6 +415,8 @@ IS_OMAP_TYPE(3517, 0x3517) #define CHIP_IS_OMAP3430ES3_1 (1 << 6) #define CHIP_IS_OMAP3630ES1 (1 << 7) #define CHIP_IS_OMAP4430ES1 (1 << 8) +#define CHIP_IS_OMAP3630ES1_1 (1 << 9) +#define CHIP_IS_OMAP3630ES1_2 (1 << 10) #define CHIP_IS_OMAP24XX (CHIP_IS_OMAP2420 | CHIP_IS_OMAP2430) @@ -424,11 +430,12 @@ IS_OMAP_TYPE(3517, 0x3517) */ #define CHIP_GE_OMAP3430ES2 (CHIP_IS_OMAP3430ES2 | \ CHIP_IS_OMAP3430ES3_0 | \ - CHIP_IS_OMAP3430ES3_1 | \ - CHIP_IS_OMAP3630ES1) + CHIP_GE_OMAP3430ES3_1) #define CHIP_GE_OMAP3430ES3_1 (CHIP_IS_OMAP3430ES3_1 | \ - CHIP_IS_OMAP3630ES1) - + CHIP_IS_OMAP3630ES1 | \ + CHIP_GE_OMAP3630ES1_1) +#define CHIP_GE_OMAP3630ES1_1 (CHIP_IS_OMAP3630ES1_1 | \ + CHIP_IS_OMAP3630ES1_2) int omap_chip_is(struct omap_chip_id oci); void omap2_check_revision(void); ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v2] OMAP3630: Add ES1.1 and ES1.2 detection 2010-08-03 19:59 ` [PATCH v2] " Anand Gadiyar @ 2010-08-04 10:30 ` Tony Lindgren 2010-08-04 10:51 ` Tony Lindgren 0 siblings, 1 reply; 13+ messages in thread From: Tony Lindgren @ 2010-08-04 10:30 UTC (permalink / raw) To: Anand Gadiyar; +Cc: linux-omap, Nishanth Menon, Manjunatha GK [-- Attachment #1: Type: text/plain, Size: 532 bytes --] * Anand Gadiyar <gadiyar@ti.com> [100803 22:52]: > Add revision detection for ES1.1 and ES1.2. Set default > revision as ES1.2. > > Add CHIP_GE_OMAP3630ES1_1 to detect revisions 1.1 and later. > This is needed for at least one feature that is broken in > 3630ES1.0 but exists on older (3430 ES3.1) and newer revisions. > > Additionally, update some of the CHIP_GE_* macros to use other > macros for ease of maintenance. Thanks, I've updated it a bit more for the fallthrough handling, here's the updated version. Regards, Tony [-- Attachment #2: omap-3630-es12.patch --] [-- Type: text/x-diff, Size: 3762 bytes --] >From 1b7fe944881114a78d04c98188b56852140480d4 Mon Sep 17 00:00:00 2001 From: Anand Gadiyar <gadiyar@ti.com> Date: Tue, 3 Aug 2010 19:59:24 +0000 Subject: [PATCH] OMAP3630: Add ES1.1 and ES1.2 detection Add revision detection for ES1.1 and ES1.2. Set default revision as ES1.2. Add CHIP_GE_OMAP3630ES1_1 to detect revisions 1.1 and later. This is needed for at least one feature that is broken in 3630ES1.0 but exists on older (3430 ES3.1) and newer revisions. Additionally, update some of the CHIP_GE_* macros to use other macros for ease of maintenance. Signed-off-by: Anand Gadiyar <gadiyar@ti.com> Cc: Nishanth Menon <nm@ti.com> Cc: Manjunatha GK <manjugk@ti.com> [tony@atomide.com: update fallthrough handling] Signed-off-by: Tony Lindgren <tony@atomide.com> diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index fd1904b..0a0ff0c 100644 --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c @@ -269,11 +269,29 @@ static void __init omap3_check_revision(void) omap_chip.oc |= CHIP_IS_OMAP3430ES3_1; break; case 0xb891: + /* Handle 36xx devices */ + omap_chip.oc |= CHIP_IS_OMAP3630ES1; + + switch(rev) { + case 0: /* Take care of early samples */ + omap_revision = OMAP3630_REV_ES1_0; + break; + case 1: + omap_revision = OMAP3630_REV_ES1_1; + omap_chip.oc |= CHIP_IS_OMAP3630ES1_1; + break; + case 2: + omap_revision = OMAP3630_REV_ES1_2; + omap_chip.oc |= CHIP_IS_OMAP3630ES1_2; + break; + default: + /* FALLTHROUGH */ + } /* FALLTHROUGH */ default: /* Unknown default to latest silicon rev as default*/ - omap_revision = OMAP3630_REV_ES1_0; - omap_chip.oc |= CHIP_IS_OMAP3630ES1; + omap_revision = OMAP3630_REV_ES1_2; + omap_chip.oc |= CHIP_IS_OMAP3630ES1_2; } } @@ -349,6 +367,12 @@ static void __init omap3_cpuinfo(void) case OMAP_REVBITS_00: strcpy(cpu_rev, "1.0"); break; + case OMAP_REVBITS_01: + strcpy(cpu_rev, "1.1"); + break; + case OMAP_REVBITS_02: + strcpy(cpu_rev, "1.2"); + break; case OMAP_REVBITS_10: strcpy(cpu_rev, "2.0"); break; diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h index aa2f4f0..2e2ae53 100644 --- a/arch/arm/plat-omap/include/plat/cpu.h +++ b/arch/arm/plat-omap/include/plat/cpu.h @@ -66,6 +66,8 @@ unsigned int omap_rev(void); * family. This difference can be handled separately. */ #define OMAP_REVBITS_00 0x00 +#define OMAP_REVBITS_01 0x01 +#define OMAP_REVBITS_02 0x02 #define OMAP_REVBITS_10 0x10 #define OMAP_REVBITS_20 0x20 #define OMAP_REVBITS_30 0x30 @@ -376,6 +378,8 @@ IS_OMAP_TYPE(3517, 0x3517) #define OMAP3430_REV_ES3_1_2 0x34305034 #define OMAP3630_REV_ES1_0 0x36300034 +#define OMAP3630_REV_ES1_1 0x36300134 +#define OMAP3630_REV_ES1_2 0x36300234 #define OMAP35XX_CLASS 0x35000034 #define OMAP3503_REV(v) (OMAP35XX_CLASS | (0x3503 << 16) | (v << 8)) @@ -411,6 +415,8 @@ IS_OMAP_TYPE(3517, 0x3517) #define CHIP_IS_OMAP3430ES3_1 (1 << 6) #define CHIP_IS_OMAP3630ES1 (1 << 7) #define CHIP_IS_OMAP4430ES1 (1 << 8) +#define CHIP_IS_OMAP3630ES1_1 (1 << 9) +#define CHIP_IS_OMAP3630ES1_2 (1 << 10) #define CHIP_IS_OMAP24XX (CHIP_IS_OMAP2420 | CHIP_IS_OMAP2430) @@ -424,11 +430,12 @@ IS_OMAP_TYPE(3517, 0x3517) */ #define CHIP_GE_OMAP3430ES2 (CHIP_IS_OMAP3430ES2 | \ CHIP_IS_OMAP3430ES3_0 | \ - CHIP_IS_OMAP3430ES3_1 | \ - CHIP_IS_OMAP3630ES1) + CHIP_GE_OMAP3430ES3_1) #define CHIP_GE_OMAP3430ES3_1 (CHIP_IS_OMAP3430ES3_1 | \ - CHIP_IS_OMAP3630ES1) - + CHIP_IS_OMAP3630ES1 | \ + CHIP_GE_OMAP3630ES1_1) +#define CHIP_GE_OMAP3630ES1_1 (CHIP_IS_OMAP3630ES1_1 | \ + CHIP_IS_OMAP3630ES1_2) int omap_chip_is(struct omap_chip_id oci); void omap2_check_revision(void); ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH v2] OMAP3630: Add ES1.1 and ES1.2 detection 2010-08-04 10:30 ` Tony Lindgren @ 2010-08-04 10:51 ` Tony Lindgren 2010-08-04 10:55 ` Gadiyar, Anand ` (2 more replies) 0 siblings, 3 replies; 13+ messages in thread From: Tony Lindgren @ 2010-08-04 10:51 UTC (permalink / raw) To: Anand Gadiyar; +Cc: linux-omap, Nishanth Menon, Manjunatha GK [-- Attachment #1: Type: text/plain, Size: 658 bytes --] * Tony Lindgren <tony@atomide.com> [100804 13:23]: > * Anand Gadiyar <gadiyar@ti.com> [100803 22:52]: > > Add revision detection for ES1.1 and ES1.2. Set default > > revision as ES1.2. > > > > Add CHIP_GE_OMAP3630ES1_1 to detect revisions 1.1 and later. > > This is needed for at least one feature that is broken in > > 3630ES1.0 but exists on older (3430 ES3.1) and newer revisions. > > > > Additionally, update some of the CHIP_GE_* macros to use other > > macros for ease of maintenance. > > Thanks, I've updated it a bit more for the fallthrough handling, > here's the updated version. That does not even build, here's the patch one more time. Tony [-- Attachment #2: omap-3630-es12.patch --] [-- Type: text/x-diff, Size: 3762 bytes --] >From 03323e6ae5e93e32aad9005b252f5b7125b39564 Mon Sep 17 00:00:00 2001 From: Anand Gadiyar <gadiyar@ti.com> Date: Tue, 3 Aug 2010 19:59:24 +0000 Subject: [PATCH] OMAP3630: Add ES1.1 and ES1.2 detection Add revision detection for ES1.1 and ES1.2. Set default revision as ES1.2. Add CHIP_GE_OMAP3630ES1_1 to detect revisions 1.1 and later. This is needed for at least one feature that is broken in 3630ES1.0 but exists on older (3430 ES3.1) and newer revisions. Additionally, update some of the CHIP_GE_* macros to use other macros for ease of maintenance. Signed-off-by: Anand Gadiyar <gadiyar@ti.com> Cc: Nishanth Menon <nm@ti.com> Cc: Manjunatha GK <manjugk@ti.com> [tony@atomide.com: update fallthrough handling] Signed-off-by: Tony Lindgren <tony@atomide.com> diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index fd1904b..0a0ff0c 100644 --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c @@ -269,11 +269,29 @@ static void __init omap3_check_revision(void) omap_chip.oc |= CHIP_IS_OMAP3430ES3_1; break; case 0xb891: + /* Handle 36xx devices */ + omap_chip.oc |= CHIP_IS_OMAP3630ES1; + + switch(rev) { + case 0: /* Take care of early samples */ + omap_revision = OMAP3630_REV_ES1_0; + break; + case 1: + omap_revision = OMAP3630_REV_ES1_1; + omap_chip.oc |= CHIP_IS_OMAP3630ES1_1; + break; + case 2: + omap_revision = OMAP3630_REV_ES1_2; + omap_chip.oc |= CHIP_IS_OMAP3630ES1_2; + break; + default: + /* FALLTHROUGH */ + } /* FALLTHROUGH */ default: /* Unknown default to latest silicon rev as default*/ - omap_revision = OMAP3630_REV_ES1_0; - omap_chip.oc |= CHIP_IS_OMAP3630ES1; + omap_revision = OMAP3630_REV_ES1_2; + omap_chip.oc |= CHIP_IS_OMAP3630ES1_2; } } @@ -349,6 +367,12 @@ static void __init omap3_cpuinfo(void) case OMAP_REVBITS_00: strcpy(cpu_rev, "1.0"); break; + case OMAP_REVBITS_01: + strcpy(cpu_rev, "1.1"); + break; + case OMAP_REVBITS_02: + strcpy(cpu_rev, "1.2"); + break; case OMAP_REVBITS_10: strcpy(cpu_rev, "2.0"); break; diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h index aa2f4f0..2e2ae53 100644 --- a/arch/arm/plat-omap/include/plat/cpu.h +++ b/arch/arm/plat-omap/include/plat/cpu.h @@ -66,6 +66,8 @@ unsigned int omap_rev(void); * family. This difference can be handled separately. */ #define OMAP_REVBITS_00 0x00 +#define OMAP_REVBITS_01 0x01 +#define OMAP_REVBITS_02 0x02 #define OMAP_REVBITS_10 0x10 #define OMAP_REVBITS_20 0x20 #define OMAP_REVBITS_30 0x30 @@ -376,6 +378,8 @@ IS_OMAP_TYPE(3517, 0x3517) #define OMAP3430_REV_ES3_1_2 0x34305034 #define OMAP3630_REV_ES1_0 0x36300034 +#define OMAP3630_REV_ES1_1 0x36300134 +#define OMAP3630_REV_ES1_2 0x36300234 #define OMAP35XX_CLASS 0x35000034 #define OMAP3503_REV(v) (OMAP35XX_CLASS | (0x3503 << 16) | (v << 8)) @@ -411,6 +415,8 @@ IS_OMAP_TYPE(3517, 0x3517) #define CHIP_IS_OMAP3430ES3_1 (1 << 6) #define CHIP_IS_OMAP3630ES1 (1 << 7) #define CHIP_IS_OMAP4430ES1 (1 << 8) +#define CHIP_IS_OMAP3630ES1_1 (1 << 9) +#define CHIP_IS_OMAP3630ES1_2 (1 << 10) #define CHIP_IS_OMAP24XX (CHIP_IS_OMAP2420 | CHIP_IS_OMAP2430) @@ -424,11 +430,12 @@ IS_OMAP_TYPE(3517, 0x3517) */ #define CHIP_GE_OMAP3430ES2 (CHIP_IS_OMAP3430ES2 | \ CHIP_IS_OMAP3430ES3_0 | \ - CHIP_IS_OMAP3430ES3_1 | \ - CHIP_IS_OMAP3630ES1) + CHIP_GE_OMAP3430ES3_1) #define CHIP_GE_OMAP3430ES3_1 (CHIP_IS_OMAP3430ES3_1 | \ - CHIP_IS_OMAP3630ES1) - + CHIP_IS_OMAP3630ES1 | \ + CHIP_GE_OMAP3630ES1_1) +#define CHIP_GE_OMAP3630ES1_1 (CHIP_IS_OMAP3630ES1_1 | \ + CHIP_IS_OMAP3630ES1_2) int omap_chip_is(struct omap_chip_id oci); void omap2_check_revision(void); ^ permalink raw reply related [flat|nested] 13+ messages in thread
* RE: [PATCH v2] OMAP3630: Add ES1.1 and ES1.2 detection 2010-08-04 10:51 ` Tony Lindgren @ 2010-08-04 10:55 ` Gadiyar, Anand 2010-08-04 11:01 ` Felipe Balbi 2010-08-04 11:06 ` Tony Lindgren 2 siblings, 0 replies; 13+ messages in thread From: Gadiyar, Anand @ 2010-08-04 10:55 UTC (permalink / raw) To: Tony Lindgren Cc: linux-omap@vger.kernel.org, Menon, Nishanth, G, Manjunath Kondaiah > -----Original Message----- > From: Tony Lindgren [mailto:tony@atomide.com] > Sent: Wednesday, August 04, 2010 4:22 PM > To: Gadiyar, Anand > Cc: linux-omap@vger.kernel.org; Menon, Nishanth; G, Manjunath Kondaiah > Subject: Re: [PATCH v2] OMAP3630: Add ES1.1 and ES1.2 detection > > * Tony Lindgren <tony@atomide.com> [100804 13:23]: > > * Anand Gadiyar <gadiyar@ti.com> [100803 22:52]: > > > Add revision detection for ES1.1 and ES1.2. Set default > > > revision as ES1.2. > > > > > > Add CHIP_GE_OMAP3630ES1_1 to detect revisions 1.1 and later. > > > This is needed for at least one feature that is broken in > > > 3630ES1.0 but exists on older (3430 ES3.1) and newer revisions. > > > > > > Additionally, update some of the CHIP_GE_* macros to use other > > > macros for ease of maintenance. > > > > Thanks, I've updated it a bit more for the fallthrough handling, > > here's the updated version. > > That does not even build, here's the patch one more time. > This one doesn't seem to build either :( The two patches you sent are identical except for the first line, so maybe you attached the wrong file? - Anand ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v2] OMAP3630: Add ES1.1 and ES1.2 detection 2010-08-04 10:51 ` Tony Lindgren 2010-08-04 10:55 ` Gadiyar, Anand @ 2010-08-04 11:01 ` Felipe Balbi 2010-08-04 11:06 ` Tony Lindgren 2 siblings, 0 replies; 13+ messages in thread From: Felipe Balbi @ 2010-08-04 11:01 UTC (permalink / raw) To: ext Tony Lindgren Cc: Anand Gadiyar, linux-omap@vger.kernel.org, Nishanth Menon, Manjunatha GK hi, On Wed, Aug 04, 2010 at 12:51:39PM +0200, ext Tony Lindgren wrote: >diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c >index fd1904b..0a0ff0c 100644 >--- a/arch/arm/mach-omap2/id.c >+++ b/arch/arm/mach-omap2/id.c >@@ -269,11 +269,29 @@ static void __init omap3_check_revision(void) > omap_chip.oc |= CHIP_IS_OMAP3430ES3_1; > break; > case 0xb891: >+ /* Handle 36xx devices */ >+ omap_chip.oc |= CHIP_IS_OMAP3630ES1; >+ >+ switch(rev) { >+ case 0: /* Take care of early samples */ >+ omap_revision = OMAP3630_REV_ES1_0; >+ break; >+ case 1: >+ omap_revision = OMAP3630_REV_ES1_1; >+ omap_chip.oc |= CHIP_IS_OMAP3630ES1_1; >+ break; >+ case 2: >+ omap_revision = OMAP3630_REV_ES1_2; >+ omap_chip.oc |= CHIP_IS_OMAP3630ES1_2; >+ break; >+ default: >+ /* FALLTHROUGH */ did you forget a break here >+ } > /* FALLTHROUGH */ > default: > /* Unknown default to latest silicon rev as default*/ >- omap_revision = OMAP3630_REV_ES1_0; >- omap_chip.oc |= CHIP_IS_OMAP3630ES1; >+ omap_revision = OMAP3630_REV_ES1_2; >+ omap_chip.oc |= CHIP_IS_OMAP3630ES1_2; and here ? -- balbi DefectiveByDesign.org ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v2] OMAP3630: Add ES1.1 and ES1.2 detection 2010-08-04 10:51 ` Tony Lindgren 2010-08-04 10:55 ` Gadiyar, Anand 2010-08-04 11:01 ` Felipe Balbi @ 2010-08-04 11:06 ` Tony Lindgren 2010-08-04 11:09 ` Felipe Balbi 2 siblings, 1 reply; 13+ messages in thread From: Tony Lindgren @ 2010-08-04 11:06 UTC (permalink / raw) To: Anand Gadiyar; +Cc: linux-omap, Nishanth Menon, Manjunatha GK [-- Attachment #1: Type: text/plain, Size: 789 bytes --] * Tony Lindgren <tony@atomide.com> [100804 13:44]: > * Tony Lindgren <tony@atomide.com> [100804 13:23]: > > * Anand Gadiyar <gadiyar@ti.com> [100803 22:52]: > > > Add revision detection for ES1.1 and ES1.2. Set default > > > revision as ES1.2. > > > > > > Add CHIP_GE_OMAP3630ES1_1 to detect revisions 1.1 and later. > > > This is needed for at least one feature that is broken in > > > 3630ES1.0 but exists on older (3430 ES3.1) and newer revisions. > > > > > > Additionally, update some of the CHIP_GE_* macros to use other > > > macros for ease of maintenance. > > > > Thanks, I've updated it a bit more for the fallthrough handling, > > here's the updated version. > > That does not even build, here's the patch one more time. Forgot to refresh, sorry. One more time below. Tony [-- Attachment #2: omap-3630-es12.patch --] [-- Type: text/x-diff, Size: 3740 bytes --] >From 9c6484502a8aba4b7a0f1f3ca847557d52a9350b Mon Sep 17 00:00:00 2001 From: Anand Gadiyar <gadiyar@ti.com> Date: Tue, 3 Aug 2010 19:59:24 +0000 Subject: [PATCH] OMAP3630: Add ES1.1 and ES1.2 detection Add revision detection for ES1.1 and ES1.2. Set default revision as ES1.2. Add CHIP_GE_OMAP3630ES1_1 to detect revisions 1.1 and later. This is needed for at least one feature that is broken in 3630ES1.0 but exists on older (3430 ES3.1) and newer revisions. Additionally, update some of the CHIP_GE_* macros to use other macros for ease of maintenance. Signed-off-by: Anand Gadiyar <gadiyar@ti.com> Cc: Nishanth Menon <nm@ti.com> Cc: Manjunatha GK <manjugk@ti.com> [tony@atomide.com: update fallthrough handling] Signed-off-by: Tony Lindgren <tony@atomide.com> diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index fd1904b..e8256a2 100644 --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c @@ -269,11 +269,27 @@ static void __init omap3_check_revision(void) omap_chip.oc |= CHIP_IS_OMAP3430ES3_1; break; case 0xb891: - /* FALLTHROUGH */ + /* Handle 36xx devices */ + omap_chip.oc |= CHIP_IS_OMAP3630ES1; + + switch(rev) { + case 0: /* Take care of early samples */ + omap_revision = OMAP3630_REV_ES1_0; + break; + case 1: + omap_revision = OMAP3630_REV_ES1_1; + omap_chip.oc |= CHIP_IS_OMAP3630ES1_1; + break; + case 2: + default: + omap_revision = OMAP3630_REV_ES1_2; + omap_chip.oc |= CHIP_IS_OMAP3630ES1_2; + break; + } default: /* Unknown default to latest silicon rev as default*/ - omap_revision = OMAP3630_REV_ES1_0; - omap_chip.oc |= CHIP_IS_OMAP3630ES1; + omap_revision = OMAP3630_REV_ES1_2; + omap_chip.oc |= CHIP_IS_OMAP3630ES1_2; } } @@ -349,6 +365,12 @@ static void __init omap3_cpuinfo(void) case OMAP_REVBITS_00: strcpy(cpu_rev, "1.0"); break; + case OMAP_REVBITS_01: + strcpy(cpu_rev, "1.1"); + break; + case OMAP_REVBITS_02: + strcpy(cpu_rev, "1.2"); + break; case OMAP_REVBITS_10: strcpy(cpu_rev, "2.0"); break; diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h index aa2f4f0..2e2ae53 100644 --- a/arch/arm/plat-omap/include/plat/cpu.h +++ b/arch/arm/plat-omap/include/plat/cpu.h @@ -66,6 +66,8 @@ unsigned int omap_rev(void); * family. This difference can be handled separately. */ #define OMAP_REVBITS_00 0x00 +#define OMAP_REVBITS_01 0x01 +#define OMAP_REVBITS_02 0x02 #define OMAP_REVBITS_10 0x10 #define OMAP_REVBITS_20 0x20 #define OMAP_REVBITS_30 0x30 @@ -376,6 +378,8 @@ IS_OMAP_TYPE(3517, 0x3517) #define OMAP3430_REV_ES3_1_2 0x34305034 #define OMAP3630_REV_ES1_0 0x36300034 +#define OMAP3630_REV_ES1_1 0x36300134 +#define OMAP3630_REV_ES1_2 0x36300234 #define OMAP35XX_CLASS 0x35000034 #define OMAP3503_REV(v) (OMAP35XX_CLASS | (0x3503 << 16) | (v << 8)) @@ -411,6 +415,8 @@ IS_OMAP_TYPE(3517, 0x3517) #define CHIP_IS_OMAP3430ES3_1 (1 << 6) #define CHIP_IS_OMAP3630ES1 (1 << 7) #define CHIP_IS_OMAP4430ES1 (1 << 8) +#define CHIP_IS_OMAP3630ES1_1 (1 << 9) +#define CHIP_IS_OMAP3630ES1_2 (1 << 10) #define CHIP_IS_OMAP24XX (CHIP_IS_OMAP2420 | CHIP_IS_OMAP2430) @@ -424,11 +430,12 @@ IS_OMAP_TYPE(3517, 0x3517) */ #define CHIP_GE_OMAP3430ES2 (CHIP_IS_OMAP3430ES2 | \ CHIP_IS_OMAP3430ES3_0 | \ - CHIP_IS_OMAP3430ES3_1 | \ - CHIP_IS_OMAP3630ES1) + CHIP_GE_OMAP3430ES3_1) #define CHIP_GE_OMAP3430ES3_1 (CHIP_IS_OMAP3430ES3_1 | \ - CHIP_IS_OMAP3630ES1) - + CHIP_IS_OMAP3630ES1 | \ + CHIP_GE_OMAP3630ES1_1) +#define CHIP_GE_OMAP3630ES1_1 (CHIP_IS_OMAP3630ES1_1 | \ + CHIP_IS_OMAP3630ES1_2) int omap_chip_is(struct omap_chip_id oci); void omap2_check_revision(void); ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH v2] OMAP3630: Add ES1.1 and ES1.2 detection 2010-08-04 11:06 ` Tony Lindgren @ 2010-08-04 11:09 ` Felipe Balbi 0 siblings, 0 replies; 13+ messages in thread From: Felipe Balbi @ 2010-08-04 11:09 UTC (permalink / raw) To: ext Tony Lindgren Cc: Anand Gadiyar, linux-omap@vger.kernel.org, Nishanth Menon, Manjunatha GK Hi, >From 9c6484502a8aba4b7a0f1f3ca847557d52a9350b Mon Sep 17 00:00:00 2001 >From: Anand Gadiyar <gadiyar@ti.com> >Date: Tue, 3 Aug 2010 19:59:24 +0000 >Subject: [PATCH] OMAP3630: Add ES1.1 and ES1.2 detection > >Add revision detection for ES1.1 and ES1.2. Set default >revision as ES1.2. > >Add CHIP_GE_OMAP3630ES1_1 to detect revisions 1.1 and later. >This is needed for at least one feature that is broken in >3630ES1.0 but exists on older (3430 ES3.1) and newer revisions. > >Additionally, update some of the CHIP_GE_* macros to use other >macros for ease of maintenance. > >Signed-off-by: Anand Gadiyar <gadiyar@ti.com> >Cc: Nishanth Menon <nm@ti.com> >Cc: Manjunatha GK <manjugk@ti.com> >[tony@atomide.com: update fallthrough handling] >Signed-off-by: Tony Lindgren <tony@atomide.com> compile tested with omap3_defconfig. Builds cleanly. -- balbi DefectiveByDesign.org ^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2010-08-04 11:11 UTC | newest] Thread overview: 13+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-07-08 10:00 Tony mostly offline for the rest of July Tony Lindgren 2010-07-08 17:37 ` Gadiyar, Anand 2010-07-09 7:29 ` Tony Lindgren 2010-07-09 23:17 ` [PATCH] OMAP3630: Add ES1.1 and ES1.2 detection Anand Gadiyar 2010-08-03 7:39 ` Tony Lindgren 2010-08-03 7:43 ` Gadiyar, Anand 2010-08-03 19:59 ` [PATCH v2] " Anand Gadiyar 2010-08-04 10:30 ` Tony Lindgren 2010-08-04 10:51 ` Tony Lindgren 2010-08-04 10:55 ` Gadiyar, Anand 2010-08-04 11:01 ` Felipe Balbi 2010-08-04 11:06 ` Tony Lindgren 2010-08-04 11:09 ` Felipe Balbi
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).