diff options
| author |   Arve Hjønnevåg <arve@android.com> | 2009-06-16 14:48:21 -0700 |
|---|---|---|
| committer |   Daniel Walker <dwalker@codeaurora.org> | 2010-05-12 09:15:07 -0700 |
| commit | ec9d3d14ffa9454e6d51e5dd1889d6e9e0be5198 (patch) | |
| tree | db2b3bde28805d86ce618e3c04e0bbf7abb0119d /arch/arm/mach-msm/smd_private.h | |
| parent | [ARM] msm: Add item argument to smsm_change_state and smsm_get_state (diff) | |
| download | linux-dev-ec9d3d14ffa9454e6d51e5dd1889d6e9e0be5198.tar.xz linux-dev-ec9d3d14ffa9454e6d51e5dd1889d6e9e0be5198.zip | |
[ARM] msm: Add 8k power collapse support to smd
Signed-off-by: Arve Hjønnevåg <arve@android.com>
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
Diffstat (limited to 'arch/arm/mach-msm/smd_private.h')
| -rw-r--r-- | arch/arm/mach-msm/smd_private.h | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/arch/arm/mach-msm/smd_private.h b/arch/arm/mach-msm/smd_private.h index 35e08359bbdb..71f9612d5f50 100644 --- a/arch/arm/mach-msm/smd_private.h +++ b/arch/arm/mach-msm/smd_private.h @@ -61,12 +61,29 @@ struct smem_shared #define SMSM_V1_SIZE (sizeof(unsigned) * 8) #define SMSM_V2_SIZE (sizeof(unsigned) * 4) +#ifndef CONFIG_ARCH_MSM_SCORPION struct smsm_interrupt_info { - uint32_t aArm_en_mask; - uint32_t aArm_interrupts_pending; - uint32_t aArm_wakeup_reason; + uint32_t interrupt_mask; + uint32_t pending_interrupts; + uint32_t wakeup_reason; +}; +#else +#define DEM_MAX_PORT_NAME_LEN (20) +struct msm_dem_slave_data { + uint32_t sleep_time; + uint32_t interrupt_mask; + uint32_t resources_used; + uint32_t reserved1; + + uint32_t wakeup_reason; + uint32_t pending_interrupts; + uint32_t rpc_prog; + uint32_t rpc_proc; + char smd_port_name[DEM_MAX_PORT_NAME_LEN]; + uint32_t reserved2; }; +#endif #define SZ_DIAG_ERR_MSG 0xC8 #define ID_DIAG_ERR_MSG SMEM_DIAG_ERR_MESSAGE @@ -131,7 +148,6 @@ void *smem_alloc(unsigned id, unsigned size); int smsm_change_state(enum smsm_state_item item, uint32_t clear_mask, uint32_t set_mask); uint32_t smsm_get_state(enum smsm_state_item item); int smsm_set_sleep_duration(uint32_t delay); -int smsm_set_interrupt_info(struct smsm_interrupt_info *info); void smsm_print_sleep_info(void); #define SMEM_NUM_SMD_CHANNELS 64 |