[PATCH v2] i.MX35: use the correct IIM register to get CPU revision

[Uwe Kleine-König]

Hello Eric,

On Fri, Oct 08, 2010 at 10:18:29AM +0200, Eric Bénard wrote:
> instead of using ROM_SI_REV use IIM's Silicon Revision register
> as described in :
> - Reference Manual 29.3.3.10
> - RM Errata 29.3.3.9.13
> 
> Signed-off-by: Eric Bénard <eric at eukrea.com>
> ---
> v2 : fix wrong part of previous patch in plat-mxc/include/mach/mx35.h
>  arch/arm/mach-mx3/clock-imx35.c       |    1 +
>  arch/arm/mach-mx3/cpu.c               |   23 +++++++++--------------
>  arch/arm/plat-mxc/include/mach/mx35.h |    2 ++
>  3 files changed, 12 insertions(+), 14 deletions(-)
> 
> diff --git a/arch/arm/mach-mx3/clock-imx35.c b/arch/arm/mach-mx3/clock-imx35.c
> index 85884c7..f7cec59 100644
> --- a/arch/arm/mach-mx3/clock-imx35.c
> +++ b/arch/arm/mach-mx3/clock-imx35.c
> @@ -535,6 +535,7 @@ int __init mx35_clocks_init()
>  	__raw_writel(cgr2, CCM_BASE + CCM_CGR2);
>  	__raw_writel(cgr3, CCM_BASE + CCM_CGR3);
>  
> +	clk_enable(&iim_clk);
>  	mx35_read_cpu_rev();

Do you let the clock running on purpose?

>  	mxc_timer_init(&gpt_clk,
> diff --git a/arch/arm/mach-mx3/cpu.c b/arch/arm/mach-mx3/cpu.c
> index db7af50..d00a754 100644
> --- a/arch/arm/mach-mx3/cpu.c
> +++ b/arch/arm/mach-mx3/cpu.c
> @@ -59,31 +59,26 @@ void __init mx31_read_cpu_rev(void)
>  unsigned int mx35_cpu_rev;
>  EXPORT_SYMBOL(mx35_cpu_rev);
>  
> -#define MX35_ROM_SI_REV		0x40
> -
>  void __init mx35_read_cpu_rev(void)
>  {
> -	void __iomem *rom = ioremap(MX35_IROM_BASE_ADDR, MX35_IROM_SIZE);
>  	u32 rev;
>  	char *srev = "unknown";
>  
> -	if (!rom)
> -		return;
> -
> -	rev = readl(rom + MX35_ROM_SI_REV);
> +	rev = __raw_readl(MX35_IO_ADDRESS(MX35_IIM_BASE_ADDR + MXC_IIMSREV));
>  	switch (rev) {
> -	case 0x1:
> -		mx35_cpu_rev = MX35_CHIP_REV_1_0;
> +	case 0x00:
> +		mx35_cpu_rev = MX3x_CHIP_REV_1_0;
>  		srev = "1.0";
>  		break;
> -	case 0x2:
> -		mx35_cpu_rev = MX35_CHIP_REV_2_0;
> +	case 0x10:
> +		mx35_cpu_rev = MX3x_CHIP_REV_2_0;
>  		srev = "2.0";
>  		break;
> +	case 0x11:
> +		mx35_cpu_rev = MX3x_CHIP_REV_2_1;
> +		srev = "2.1";
> +		break;
Would it make sense here to do:

	mx35_cpu_rev = 0x10 + rev;

?

>  	}
>  
>  	printk(KERN_INFO "CPU identified as i.MX35, silicon rev %s\n", srev);
> -
> -	iounmap(rom);
>  }
> -
> diff --git a/arch/arm/plat-mxc/include/mach/mx35.h b/arch/arm/plat-mxc/include/mach/mx35.h
> index 4a864c3..92794be 100644
> --- a/arch/arm/plat-mxc/include/mach/mx35.h
> +++ b/arch/arm/plat-mxc/include/mach/mx35.h
> @@ -70,6 +70,8 @@
>  #define MX35_CAN1_BASE_ADDR			(MX35_AIPS2_BASE_ADDR + 0xe4000)
>  #define MX35_CAN2_BASE_ADDR			(MX35_AIPS2_BASE_ADDR + 0xe8000)
>  #define MX35_RTIC_BASE_ADDR			(MX35_AIPS2_BASE_ADDR + 0xec000)
> +#define MX35_IIM_BASE_ADDR			(MX35_AIPS2_BASE_ADDR + 0xf0000)
> +
>  #define MX35_OTG_BASE_ADDR		0x53ff4000
>  
>  #define MX35_ROMP_BASE_ADDR		0x60000000
> -- 
> 1.7.0.4
> 
> 

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |