diff options
| author | Olof Johansson <olof@lixom.net> | 2011-12-19 21:04:06 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-12-19 21:04:06 -0800 |
| commit | fe5d3e887e3f9d0a97e5b8df968ab84a12128495 (patch) | |
| tree | cff90b5421967f17d11a7611a9c5f0fca0be4d67 /arch/arm/plat-omap | |
| parent | eb3e1d9ded81a0036bb42b7c771307fa97f03dc9 (diff) | |
| parent | 9d297f5ee1b92a84e2cd6c547c3ac1f893128359 (diff) | |
| download | kernel_goldelico_gta04-fe5d3e887e3f9d0a97e5b8df968ab84a12128495.zip kernel_goldelico_gta04-fe5d3e887e3f9d0a97e5b8df968ab84a12128495.tar.gz kernel_goldelico_gta04-fe5d3e887e3f9d0a97e5b8df968ab84a12128495.tar.bz2 | |
Merge branch 'prcm' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into omap/prcm
Diffstat (limited to 'arch/arm/plat-omap')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/omap_hwmod.h | 6 |
1 files changed, 6 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 8b372ed..6470101 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; }; @@ -416,10 +417,13 @@ struct omap_hwmod_omap4_prcm { * _HWMOD_NO_MPU_PORT: no path exists for the MPU to write to this module * _HWMOD_WAKEUP_ENABLED: set when the omap_hwmod code has enabled ENAWAKEUP * _HWMOD_SYSCONFIG_LOADED: set when the OCP_SYSCONFIG value has been cached + * _HWMOD_SKIP_ENABLE: set if hwmod enabled during init (HWMOD_INIT_NO_IDLE) - + * causes the first call to _enable() to only update the pinmux */ #define _HWMOD_NO_MPU_PORT (1 << 0) #define _HWMOD_WAKEUP_ENABLED (1 << 1) #define _HWMOD_SYSCONFIG_LOADED (1 << 2) +#define _HWMOD_SKIP_ENABLE (1 << 3) /* * omap_hwmod._state definitions @@ -604,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 |