diff options
| author | Tony Lindgren | 2011-12-16 23:00:23 +0100 |
|---|---|---|
| committer | Tony Lindgren | 2011-12-16 23:00:23 +0100 |
| commit | 9d297f5ee1b92a84e2cd6c547c3ac1f893128359 (patch) | |
| tree | cff90b5421967f17d11a7611a9c5f0fca0be4d67 /arch/arm/plat-omap | |
| parent | ARM: OMAP2+: hwmod: Add a new flag to handle hwmods left enabled at init (diff) | |
| parent | ARM: OMAP4: PRM: use PRCM interrupt handler (diff) | |
| download | kernel-qcow2-linux-9d297f5ee1b92a84e2cd6c547c3ac1f893128359.tar.gz kernel-qcow2-linux-9d297f5ee1b92a84e2cd6c547c3ac1f893128359.tar.xz kernel-qcow2-linux-9d297f5ee1b92a84e2cd6c547c3ac1f893128359.zip | |
Merge branch 'tk_prm_chain_handler_devel_3.3' of git://git.pwsan.com/linux-2.6 into prcm
Conflicts:
arch/arm/mach-omap2/Makefile
Diffstat (limited to 'arch/arm/plat-omap')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/omap_hwmod.h | 3 |
1 files changed, 3 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 1a13c02118df..647010109afa 100644 --- a/arch/arm/plat-omap/include/plat/omap_hwmod.h +++ b/arch/arm/plat-omap/include/plat/omap_hwmod.h @@ -97,6 +97,7 @@ struct omap_hwmod_mux_info { struct omap_device_pad *pads; int nr_pads_dynamic; struct omap_device_pad **pads_dynamic; + int *irqs; bool enabled; }; @@ -607,6 +608,8 @@ int omap_hwmod_get_context_loss_count(struct omap_hwmod *oh); int omap_hwmod_no_setup_reset(struct omap_hwmod *oh); +int omap_hwmod_pad_route_irq(struct omap_hwmod *oh, int pad_idx, int irq_idx); + /* * Chip variant-specific hwmod init routines - XXX should be converted * to use initcalls once the initial boot ordering is straightened out |