diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-09-12 21:29:07 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-09-12 21:29:07 -0700 |
| commit | 11964f53eb4d9ce59a058be9999d9cfcb1ced878 (patch) | |
| tree | da3b0469faa749b7ac42ca617980d3f4a234af75 /arch/arm/plat-omap | |
| 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/plat-omap')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/omap_hwmod.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/include/plat/omap_hwmod.h b/arch/arm/plat-omap/include/plat/omap_hwmod.h index 6132972aff3..9b9646c3673 100644 --- a/arch/arm/plat-omap/include/plat/omap_hwmod.h +++ b/arch/arm/plat-omap/include/plat/omap_hwmod.h @@ -658,6 +658,7 @@ extern int omap2420_hwmod_init(void); extern int omap2430_hwmod_init(void); extern int omap3xxx_hwmod_init(void); extern int omap44xx_hwmod_init(void); +extern int am33xx_hwmod_init(void); extern int __init omap_hwmod_register_links(struct omap_hwmod_ocp_if **ois); |