[PATCH 11/14] omap4: Fix silicon version detection for early samples

[Menon, Nishanth]

> -----Original Message-----
> From: linux-omap-owner at vger.kernel.org [mailto:linux-omap-
> owner at vger.kernel.org] On Behalf Of Shilimkar, Santosh
> Sent: Friday, September 17, 2010 4:48 AM

[..]

> diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
> index ae70ae9..0412233 100644
> --- a/arch/arm/mach-omap2/id.c
> +++ b/arch/arm/mach-omap2/id.c
> @@ -308,6 +308,15 @@ static void __init omap4_check_revision(void)
>  	hawkeye = (idcode >> 12) & 0xffff;
>  	rev = (idcode >> 28) & 0xff;
> 
> +	/*
> +	 * Few initial ES2.0 samples IDCODE is same as ES1.0
> +	 * Use ARM register to detect the correct ES version
> +	 */
> +	if (!rev) {
> +		idcode = read_cpuid(CPUID_ID);
> +		rev = (idcode & 0xf) - 1;
> +	}
> +

Squash this to patch 10?

Regards,
Nishanth Menon