diff options
author | Afzal Mohammed <afzal@ti.com> | 2012-05-10 15:08:49 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-06-05 03:52:37 -0400 |
commit | 08f3098928c991560408e8c71d4af8b1a3ff2d67 (patch) | |
tree | 24c2732957582a4f0a253455609ab7a45981a598 /arch/arm/mach-omap2/io.c | |
parent | d0a9001dce0ea24751b1f6336f2881ac906cabbb (diff) |
ARM: OMAP2+: am33xx: Add AM335XEVM machine support
This patch adds minimal support for AM335X machine init.
During last merge window, two separate patches supporting am33xx
machine init had been submitted,
1. Link to earlier Baseport patch submission (Legacy):
http://www.mail-archive.com/linux-omap@vger.kernel.org/msg59325.html
2. Link to earlier DT based machine init support patch submission:
http://www.mail-archive.com/linux-omap@vger.kernel.org/msg61398.html
And both had got accepted at that time, but got missed during
merge window.
But now, since we have taken decision to make am33xx as a separate
class and not to follow omap3 family, these patches needs to changes
accordingly (only changes),
- Combine both the patches, since early init and timer init
used in board-generic.c file requires them.
- Remove dependency on AM3517EVM, and only use DT approach
for machine init.
- Change the config option (as changed recently)
CONFIG_SOC_OMAPAM33XX --> CONFIG_SOC_AM33XX
Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
Cc: Benoit Cousson <b-cousson@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/io.c')
-rw-r--r-- | arch/arm/mach-omap2/io.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index 8d014ba04abc..5d6b2346bf75 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c | |||
@@ -477,6 +477,16 @@ void __init ti81xx_init_late(void) | |||
477 | } | 477 | } |
478 | #endif | 478 | #endif |
479 | 479 | ||
480 | #ifdef CONFIG_SOC_AM33XX | ||
481 | void __init am33xx_init_early(void) | ||
482 | { | ||
483 | omap2_set_globals_am33xx(); | ||
484 | omap3xxx_check_revision(); | ||
485 | ti81xx_check_features(); | ||
486 | omap_common_init_early(); | ||
487 | } | ||
488 | #endif | ||
489 | |||
480 | #ifdef CONFIG_ARCH_OMAP4 | 490 | #ifdef CONFIG_ARCH_OMAP4 |
481 | void __init omap4430_init_early(void) | 491 | void __init omap4430_init_early(void) |
482 | { | 492 | { |