diff options
author | Tony Lindgren <tony@atomide.com> | 2009-05-28 15:45:14 -0700 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2009-05-28 15:45:14 -0700 |
commit | cd07ecc828486e5887113c7dc4d9f9022145811b (patch) | |
tree | f3950d6077a794d4500244b2f372c6912af15eec /arch/arm/mach-omap2/id.c | |
parent | 4c50d22a0cf240918d53afbf9a8416a9d93aacee (diff) | |
parent | b04e8975e70d9b2bc27c017f92b356b312692544 (diff) |
Merge branch 'omap4' into for-next
Diffstat (limited to 'arch/arm/mach-omap2/id.c')
-rw-r--r-- | arch/arm/mach-omap2/id.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index 34b5914e0f8..458990e20c6 100644 --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c @@ -6,6 +6,9 @@ * Copyright (C) 2005 Nokia Corporation * Written by Tony Lindgren <tony@atomide.com> * + * Copyright (C) 2009 Texas Instruments + * Added OMAP4 support - Santosh Shilimkar <santosh.shilimkar@ti.com> + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. @@ -200,7 +203,10 @@ void __init omap2_check_revision(void) omap24xx_check_revision(); else if (cpu_is_omap34xx()) omap34xx_check_revision(); - else + else if (cpu_is_omap44xx()) { + printk(KERN_INFO "FIXME: CPU revision = OMAP4430\n"); + return; + } else pr_err("OMAP revision unknown, please fix!\n"); /* |