[PATCH 1/5] ARM: OMAP4: PM: OMAP4 essential basic initialisations.

Tony Lindgren tony at atomide.com
Mon Dec 28 18:33:31 EST 2009


* Abhijit.Pagare at india.ti.com <Abhijit.Pagare at india.ti.com> [091211 02:50]:
> From: Abhijit Pagare <abhijitpagare at ti.com>
> 
> Some of the OMAP4 specific chip level initialisations are taken care of.

Here's yet another series of patches with "PM" in the subject
for no obvious reason.

Please repost all with with sensible subjects.

Tony

 
> Signed-off-by: Abhijit Pagare <abhijitpagare at ti.com>
> Cc: Paul Walmsley <paul at pwsan.com>
> Cc: Benoit Cousson <b-cousson at ti.com>
> Cc: Rajendra Nayak <rnayak at ti.com>
> ---
>  arch/arm/mach-omap2/id.c              |    8 +++++++-
>  arch/arm/plat-omap/include/plat/cpu.h |    6 +++++-
>  2 files changed, 12 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
> index 4fad192..52aca5f 100644
> --- a/arch/arm/mach-omap2/id.c
> +++ b/arch/arm/mach-omap2/id.c
> @@ -336,8 +336,12 @@ void __init omap2_check_revision(void)
>  		omap3_check_features();
>  		omap3_cpuinfo();
>  	} else if (cpu_is_omap44xx()) {
> +		/*
> +		 * omap44xx_check_revision() should
> +		 * be defined above and then called
> +		 * from here.
> +		 */
>  		printk(KERN_INFO "FIXME: CPU revision = OMAP4430\n");
> -		return;
>  	} else {
>  		pr_err("OMAP revision unknown, please fix!\n");
>  	}
> @@ -367,6 +371,8 @@ void __init omap2_check_revision(void)
>  			omap_chip.oc |= CHIP_IS_OMAP3430ES3_1;
>  		else if (omap_rev() == OMAP3630_REV_ES1_0)
>  			omap_chip.oc |= CHIP_IS_OMAP3630ES1;
> +	} else if (cpu_is_omap44xx()) {
> +		omap_chip.oc |= CHIP_IS_OMAP4430;
>  	} else {
>  		pr_err("Uninitialized omap_chip, please fix!\n");
>  	}
> diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h
> index 2e17890..6a296b8 100644
> --- a/arch/arm/plat-omap/include/plat/cpu.h
> +++ b/arch/arm/plat-omap/include/plat/cpu.h
> @@ -154,6 +154,7 @@ unsigned int omap_rev(void);
>   * cpu_is_omap242x():	True for OMAP2420, OMAP2422, OMAP2423
>   * cpu_is_omap243x():	True for OMAP2430
>   * cpu_is_omap343x():	True for OMAP3430
> + * cpu_is_omap443x():	True for OMAP4430
>   */
>  #define GET_OMAP_CLASS	(omap_rev() & 0xff)
>  
> @@ -284,6 +285,7 @@ IS_OMAP_SUBCLASS(363x, 0x363)
>   * cpu_is_omap2423():	True for OMAP2423
>   * cpu_is_omap2430():	True for OMAP2430
>   * cpu_is_omap3430():	True for OMAP3430
> + * cpu_is_omap4430():	True for OMAP4430
>   * cpu_is_omap3505():	True for OMAP3505
>   * cpu_is_omap3517():	True for OMAP3517
>   */
> @@ -332,6 +334,7 @@ IS_OMAP_TYPE(3517, 0x3517)
>  #define cpu_is_omap3505()		0
>  #define cpu_is_omap3517()		0
>  #define cpu_is_omap3430()		0
> +#define cpu_is_omap4430()		0
>  #define cpu_is_omap3630()		0
>  
>  /*
> @@ -443,7 +446,7 @@ IS_OMAP_TYPE(3517, 0x3517)
>  #define OMAP3505_REV(v)		(OMAP35XX_CLASS | (0x3505 << 16) | (v << 12))
>  #define OMAP3517_REV(v)		(OMAP35XX_CLASS | (0x3517 << 16) | (v << 12))
>  
> -#define OMAP443X_CLASS		0x44300034
> +#define OMAP443X_CLASS		0x44300044
>  
>  /*
>   * omap_chip bits
> @@ -467,6 +470,7 @@ IS_OMAP_TYPE(3517, 0x3517)
>  #define CHIP_IS_OMAP3430ES3_0		(1 << 5)
>  #define CHIP_IS_OMAP3430ES3_1		(1 << 6)
>  #define CHIP_IS_OMAP3630ES1		(1 << 7)
> +#define CHIP_IS_OMAP4430		(1 << 8)
>  
>  #define CHIP_IS_OMAP24XX		(CHIP_IS_OMAP2420 | CHIP_IS_OMAP2430)
>  
> -- 
> 1.5.4.7
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel



More information about the linux-arm-kernel mailing list