diff options
Diffstat (limited to 'arch/arm/plat-omap/include/plat/omap_hwmod.h')
-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 8b372ede17c1..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 { | |||
97 | struct omap_device_pad *pads; | 97 | struct omap_device_pad *pads; |
98 | int nr_pads_dynamic; | 98 | int nr_pads_dynamic; |
99 | struct omap_device_pad **pads_dynamic; | 99 | struct omap_device_pad **pads_dynamic; |
100 | int *irqs; | ||
100 | bool enabled; | 101 | bool enabled; |
101 | }; | 102 | }; |
102 | 103 | ||
@@ -416,10 +417,13 @@ struct omap_hwmod_omap4_prcm { | |||
416 | * _HWMOD_NO_MPU_PORT: no path exists for the MPU to write to this module | 417 | * _HWMOD_NO_MPU_PORT: no path exists for the MPU to write to this module |
417 | * _HWMOD_WAKEUP_ENABLED: set when the omap_hwmod code has enabled ENAWAKEUP | 418 | * _HWMOD_WAKEUP_ENABLED: set when the omap_hwmod code has enabled ENAWAKEUP |
418 | * _HWMOD_SYSCONFIG_LOADED: set when the OCP_SYSCONFIG value has been cached | 419 | * _HWMOD_SYSCONFIG_LOADED: set when the OCP_SYSCONFIG value has been cached |
420 | * _HWMOD_SKIP_ENABLE: set if hwmod enabled during init (HWMOD_INIT_NO_IDLE) - | ||
421 | * causes the first call to _enable() to only update the pinmux | ||
419 | */ | 422 | */ |
420 | #define _HWMOD_NO_MPU_PORT (1 << 0) | 423 | #define _HWMOD_NO_MPU_PORT (1 << 0) |
421 | #define _HWMOD_WAKEUP_ENABLED (1 << 1) | 424 | #define _HWMOD_WAKEUP_ENABLED (1 << 1) |
422 | #define _HWMOD_SYSCONFIG_LOADED (1 << 2) | 425 | #define _HWMOD_SYSCONFIG_LOADED (1 << 2) |
426 | #define _HWMOD_SKIP_ENABLE (1 << 3) | ||
423 | 427 | ||
424 | /* | 428 | /* |
425 | * omap_hwmod._state definitions | 429 | * omap_hwmod._state definitions |
@@ -604,6 +608,8 @@ int omap_hwmod_get_context_loss_count(struct omap_hwmod *oh); | |||
604 | 608 | ||
605 | int omap_hwmod_no_setup_reset(struct omap_hwmod *oh); | 609 | int omap_hwmod_no_setup_reset(struct omap_hwmod *oh); |
606 | 610 | ||
611 | int omap_hwmod_pad_route_irq(struct omap_hwmod *oh, int pad_idx, int irq_idx); | ||
612 | |||
607 | /* | 613 | /* |
608 | * Chip variant-specific hwmod init routines - XXX should be converted | 614 | * Chip variant-specific hwmod init routines - XXX should be converted |
609 | * to use initcalls once the initial boot ordering is straightened out | 615 | * to use initcalls once the initial boot ordering is straightened out |