system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-30 16:29:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

ARM: OMAP4: PM: OMAP4 essential basic initialisations.

Browse source 
Some of the OMAP4 specific chip level initialisations are taken care of.

Signed-off-by: Abhijit Pagare <abhijitpagare@ti.com>
Cc: Benoit Cousson <b-cousson@ti.com>
Cc: Rajendra Nayak <rnayak@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
[paul@pwsan.com: updated to use '4430ES1' rather than simply '4430'; updated
 to apply after the intervening cpu.h/id.c patch; thanks also to Tony
 for catching a bug in my rewrite]
Signed-off-by: Paul Walmsley <paul@pwsan.com>
This commit is contained in:
Abhijit Pagare 2010-01-26 20:12:51 -07:00 committed by Paul Walmsley
parent 4f4e65d248
commit c6a6e6e203
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/arm/mach-omap2/id.c
View file

@ -281,6 +281,7 @@ void __init omap4_check_revision(void)
if ((hawkeye == 0xb852) && (rev == 0x0)) { if ((hawkeye == 0xb852) && (rev == 0x0)) {
omap_revision = OMAP4430_REV_ES1_0; omap_revision = OMAP4430_REV_ES1_0;
omap_chip.oc |= CHIP_IS_OMAP4430ES1;
pr_info("OMAP%04x %s\n", omap_rev() >> 16, rev_name); pr_info("OMAP%04x %s\n", omap_rev() >> 16, rev_name);
return; return;
} }

8
arch/arm/plat-omap/include/plat/cpu.h
View file

@ -44,7 +44,7 @@
int omap_type(void); int omap_type(void);
struct omap_chip_id { struct omap_chip_id {
u8 oc; u16 oc;
u8 type; u8 type;
}; };
@ -154,6 +154,7 @@ unsigned int omap_rev(void);
* cpu_is_omap242x(): True for OMAP2420, OMAP2422, OMAP2423 * cpu_is_omap242x(): True for OMAP2420, OMAP2422, OMAP2423
* cpu_is_omap243x(): True for OMAP2430 * cpu_is_omap243x(): True for OMAP2430
* cpu_is_omap343x(): True for OMAP3430 * cpu_is_omap343x(): True for OMAP3430
* cpu_is_omap443x(): True for OMAP4430
*/ */
#define GET_OMAP_CLASS (omap_rev() & 0xff) #define GET_OMAP_CLASS (omap_rev() & 0xff)
@ -286,6 +287,7 @@ IS_OMAP_SUBCLASS(443x, 0x443)
* cpu_is_omap2423(): True for OMAP2423 * cpu_is_omap2423(): True for OMAP2423
* cpu_is_omap2430(): True for OMAP2430 * cpu_is_omap2430(): True for OMAP2430
* cpu_is_omap3430(): True for OMAP3430 * cpu_is_omap3430(): True for OMAP3430
* cpu_is_omap4430(): True for OMAP4430
* cpu_is_omap3505(): True for OMAP3505 * cpu_is_omap3505(): True for OMAP3505
* cpu_is_omap3517(): True for OMAP3517 * cpu_is_omap3517(): True for OMAP3517
*/ */
@ -334,6 +336,7 @@ IS_OMAP_TYPE(3517, 0x3517)
#define cpu_is_omap3505() 0 #define cpu_is_omap3505() 0
#define cpu_is_omap3517() 0 #define cpu_is_omap3517() 0
#define cpu_is_omap3430() 0 #define cpu_is_omap3430() 0
#define cpu_is_omap4430() 0
#define cpu_is_omap3630() 0 #define cpu_is_omap3630() 0
/* /*
@ -471,9 +474,12 @@ IS_OMAP_TYPE(3517, 0x3517)
#define CHIP_IS_OMAP3430ES3_0 (1 << 5) #define CHIP_IS_OMAP3430ES3_0 (1 << 5)
#define CHIP_IS_OMAP3430ES3_1 (1 << 6) #define CHIP_IS_OMAP3430ES3_1 (1 << 6)
#define CHIP_IS_OMAP3630ES1 (1 << 7) #define CHIP_IS_OMAP3630ES1 (1 << 7)
#define CHIP_IS_OMAP4430ES1 (1 << 8)
#define CHIP_IS_OMAP24XX (CHIP_IS_OMAP2420 | CHIP_IS_OMAP2430) #define CHIP_IS_OMAP24XX (CHIP_IS_OMAP2420 | CHIP_IS_OMAP2430)
#define CHIP_IS_OMAP4430 (CHIP_IS_OMAP4430ES1)
/* /*
* "GE" here represents "greater than or equal to" in terms of ES * "GE" here represents "greater than or equal to" in terms of ES
* levels. So CHIP_GE_OMAP3430ES2 is intended to match all OMAP3430 * levels. So CHIP_GE_OMAP3430ES2 is intended to match all OMAP3430