linux-omap.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] omap: id: add chip id recognition for omap4430 es2.3
@ 2011-11-07 18:17 David Anders
  2011-12-07 23:43 ` Tony Lindgren
  0 siblings, 1 reply; 3+ messages in thread
From: David Anders @ 2011-11-07 18:17 UTC (permalink / raw)
  To: danders.dev, linux-omap, tony, nm, aneesh, jayabharath; +Cc: David Anders

allow for the omap4430 es2.3 revision to be recognized in the
omap4_check_revision() function.

most aspects of all omap4430 es2.x versions are identical, however
a number of small variations such as default pullup or pulldown
resistor configurations vary between revisions.

detailed information on silicon errata for omap4430 revisions can
be found at http://focus.ti.com/pdfs/wtbu/swpz009D.pdf

Signed-off-by: David Anders <x0132446@ti.com>
---
 arch/arm/mach-omap2/id.c              |    6 ++++--
 arch/arm/plat-omap/include/plat/cpu.h |    1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index d27daf9..6681238 100644
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -386,8 +386,10 @@ static void __init omap4_check_revision(void)
 			omap_revision = OMAP4430_REV_ES2_1;
 			break;
 		case 4:
-		default:
 			omap_revision = OMAP4430_REV_ES2_2;
+		case 6:
+		default:
+			omap_revision = OMAP4430_REV_ES2_3;
 		}
 		break;
 	case 0xb94e:
@@ -400,7 +402,7 @@ static void __init omap4_check_revision(void)
 		break;
 	default:
 		/* Unknown default to latest silicon rev as default */
-		omap_revision = OMAP4430_REV_ES2_2;
+		omap_revision = OMAP4430_REV_ES2_3;
 	}
 
 	pr_info("OMAP%04x ES%d.%d\n", omap_rev() >> 16,
diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h
index 649b370..a2fc6d3 100644
--- a/arch/arm/plat-omap/include/plat/cpu.h
+++ b/arch/arm/plat-omap/include/plat/cpu.h
@@ -416,6 +416,7 @@ IS_OMAP_TYPE(3517, 0x3517)
 #define OMAP4430_REV_ES2_0	(OMAP443X_CLASS | (0x20 << 8))
 #define OMAP4430_REV_ES2_1	(OMAP443X_CLASS | (0x21 << 8))
 #define OMAP4430_REV_ES2_2	(OMAP443X_CLASS | (0x22 << 8))
+#define OMAP4430_REV_ES2_3	(OMAP443X_CLASS | (0x23 << 8))
 
 #define OMAP446X_CLASS		0x44600044
 #define OMAP4460_REV_ES1_0	(OMAP446X_CLASS | (0x10 << 8))
-- 
1.7.0.4


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] omap: id: add chip id recognition for omap4430 es2.3
  2011-11-07 18:17 [PATCH] omap: id: add chip id recognition for omap4430 es2.3 David Anders
@ 2011-12-07 23:43 ` Tony Lindgren
  2011-12-08  0:01   ` David Anders
  0 siblings, 1 reply; 3+ messages in thread
From: Tony Lindgren @ 2011-12-07 23:43 UTC (permalink / raw)
  To: David Anders; +Cc: danders.dev, linux-omap, nm, aneesh, jayabharath

* David Anders <x0132446@ti.com> [111107 09:43]:
> allow for the omap4430 es2.3 revision to be recognized in the
> omap4_check_revision() function.
> 
> most aspects of all omap4430 es2.x versions are identical, however
> a number of small variations such as default pullup or pulldown
> resistor configurations vary between revisions.
> 
> detailed information on silicon errata for omap4430 revisions can
> be found at http://focus.ti.com/pdfs/wtbu/swpz009D.pdf

Thanks applying into soc branch.

Tony
 
> Signed-off-by: David Anders <x0132446@ti.com>
> ---
>  arch/arm/mach-omap2/id.c              |    6 ++++--
>  arch/arm/plat-omap/include/plat/cpu.h |    1 +
>  2 files changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
> index d27daf9..6681238 100644
> --- a/arch/arm/mach-omap2/id.c
> +++ b/arch/arm/mach-omap2/id.c
> @@ -386,8 +386,10 @@ static void __init omap4_check_revision(void)
>  			omap_revision = OMAP4430_REV_ES2_1;
>  			break;
>  		case 4:
> -		default:
>  			omap_revision = OMAP4430_REV_ES2_2;
> +		case 6:
> +		default:
> +			omap_revision = OMAP4430_REV_ES2_3;
>  		}
>  		break;
>  	case 0xb94e:
> @@ -400,7 +402,7 @@ static void __init omap4_check_revision(void)
>  		break;
>  	default:
>  		/* Unknown default to latest silicon rev as default */
> -		omap_revision = OMAP4430_REV_ES2_2;
> +		omap_revision = OMAP4430_REV_ES2_3;
>  	}
>  
>  	pr_info("OMAP%04x ES%d.%d\n", omap_rev() >> 16,
> diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h
> index 649b370..a2fc6d3 100644
> --- a/arch/arm/plat-omap/include/plat/cpu.h
> +++ b/arch/arm/plat-omap/include/plat/cpu.h
> @@ -416,6 +416,7 @@ IS_OMAP_TYPE(3517, 0x3517)
>  #define OMAP4430_REV_ES2_0	(OMAP443X_CLASS | (0x20 << 8))
>  #define OMAP4430_REV_ES2_1	(OMAP443X_CLASS | (0x21 << 8))
>  #define OMAP4430_REV_ES2_2	(OMAP443X_CLASS | (0x22 << 8))
> +#define OMAP4430_REV_ES2_3	(OMAP443X_CLASS | (0x23 << 8))
>  
>  #define OMAP446X_CLASS		0x44600044
>  #define OMAP4460_REV_ES1_0	(OMAP446X_CLASS | (0x10 << 8))
> -- 
> 1.7.0.4
> 

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] omap: id: add chip id recognition for omap4430 es2.3
  2011-12-07 23:43 ` Tony Lindgren
@ 2011-12-08  0:01   ` David Anders
  0 siblings, 0 replies; 3+ messages in thread
From: David Anders @ 2011-12-08  0:01 UTC (permalink / raw)
  To: Tony Lindgren; +Cc: danders.dev, linux-omap, nm, aneesh, jayabharath

Tony,

On 12/07/2011 05:43 PM, Tony Lindgren wrote:
> * David Anders<x0132446@ti.com>  [111107 09:43]:
>    
>> allow for the omap4430 es2.3 revision to be recognized in the
>> omap4_check_revision() function.
>>
>> most aspects of all omap4430 es2.x versions are identical, however
>> a number of small variations such as default pullup or pulldown
>> resistor configurations vary between revisions.
>>
>> detailed information on silicon errata for omap4430 revisions can
>> be found at http://focus.ti.com/pdfs/wtbu/swpz009D.pdf
>>      
> Thanks applying into soc branch.
>
>    

i have a v2 of this patch that corrects a missing break. please apply v2 
instead

> Tony
>
>    

thanks
Dave

>> Signed-off-by: David Anders<x0132446@ti.com>
>> ---
>>   arch/arm/mach-omap2/id.c              |    6 ++++--
>>   arch/arm/plat-omap/include/plat/cpu.h |    1 +
>>   2 files changed, 5 insertions(+), 2 deletions(-)
>>
>> diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
>> index d27daf9..6681238 100644
>> --- a/arch/arm/mach-omap2/id.c
>> +++ b/arch/arm/mach-omap2/id.c
>> @@ -386,8 +386,10 @@ static void __init omap4_check_revision(void)
>>   			omap_revision = OMAP4430_REV_ES2_1;
>>   			break;
>>   		case 4:
>> -		default:
>>   			omap_revision = OMAP4430_REV_ES2_2;
>> +		case 6:
>> +		default:
>> +			omap_revision = OMAP4430_REV_ES2_3;
>>   		}
>>   		break;
>>   	case 0xb94e:
>> @@ -400,7 +402,7 @@ static void __init omap4_check_revision(void)
>>   		break;
>>   	default:
>>   		/* Unknown default to latest silicon rev as default */
>> -		omap_revision = OMAP4430_REV_ES2_2;
>> +		omap_revision = OMAP4430_REV_ES2_3;
>>   	}
>>
>>   	pr_info("OMAP%04x ES%d.%d\n", omap_rev()>>  16,
>> diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h
>> index 649b370..a2fc6d3 100644
>> --- a/arch/arm/plat-omap/include/plat/cpu.h
>> +++ b/arch/arm/plat-omap/include/plat/cpu.h
>> @@ -416,6 +416,7 @@ IS_OMAP_TYPE(3517, 0x3517)
>>   #define OMAP4430_REV_ES2_0	(OMAP443X_CLASS | (0x20<<  8))
>>   #define OMAP4430_REV_ES2_1	(OMAP443X_CLASS | (0x21<<  8))
>>   #define OMAP4430_REV_ES2_2	(OMAP443X_CLASS | (0x22<<  8))
>> +#define OMAP4430_REV_ES2_3	(OMAP443X_CLASS | (0x23<<  8))
>>
>>   #define OMAP446X_CLASS		0x44600044
>>   #define OMAP4460_REV_ES1_0	(OMAP446X_CLASS | (0x10<<  8))
>> -- 
>> 1.7.0.4
>>
>>      


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2011-12-08  0:01 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-07 18:17 [PATCH] omap: id: add chip id recognition for omap4430 es2.3 David Anders
2011-12-07 23:43 ` Tony Lindgren
2011-12-08  0:01   ` David Anders

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).