diff options
author | Tony Lindgren <tony@atomide.com> | 2012-09-13 00:29:07 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-09-13 00:29:07 -0400 |
commit | 11964f53eb4d9ce59a058be9999d9cfcb1ced878 (patch) | |
tree | da3b0469faa749b7ac42ca617980d3f4a234af75 /arch/arm/mach-omap2/io.c | |
parent | 68cb700c59fae6cd539c9dc1e9f2584f671935a0 (diff) | |
parent | 83c115426818378370b8cf2be16ca19bdcdc2ac4 (diff) |
Merge tag 'omap-devel-a2-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into devel-am33xx
AM33xx hwmod data and miscellaneous clock and hwmod fixes. AM33xx
should now boot on mainline after this is applied, according to
Vaibhav.
This second version includes trailing commas at the end of structure
records at Tony's request. It also adds a OMAP_INTC_START macro
expansion to each IRQ number to make the sparseirq conversion easier.
Basic build, boot, and PM test transcripts are here:
http://www.pwsan.com/omap/testlogs/am33xx_hwmod_clock_devel_3.7/20120912165952/
Diffstat (limited to 'arch/arm/mach-omap2/io.c')
-rw-r--r-- | arch/arm/mach-omap2/io.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index 0d79c23e9f88..4234d28dc171 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c | |||
@@ -524,6 +524,8 @@ void __init am33xx_init_early(void) | |||
524 | am33xx_voltagedomains_init(); | 524 | am33xx_voltagedomains_init(); |
525 | am33xx_powerdomains_init(); | 525 | am33xx_powerdomains_init(); |
526 | am33xx_clockdomains_init(); | 526 | am33xx_clockdomains_init(); |
527 | am33xx_hwmod_init(); | ||
528 | omap_hwmod_init_postsetup(); | ||
527 | am33xx_clk_init(); | 529 | am33xx_clk_init(); |
528 | } | 530 | } |
529 | #endif | 531 | #endif |