diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-08-16 13:42:58 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-08-16 13:42:58 -0400 |
| commit | e4862f2f6f5653dfb67f3ba2b6f0bc74516ed51a (patch) | |
| tree | 1db5a0540a4eecfad9b7daee476b985e82ddc810 /include/sound | |
| parent | ec62dbd7eb8e3dddb221da89ecbcea0fc3dee8c1 (diff) | |
| parent | b2c1e07b81a126e5846dfc3d36f559d861df59f4 (diff) | |
Merge branch 'for-2.6.36' into for-2.6.37
Fairly simple conflicts, the most serious ones are the i.MX ones which I
suspect now need another rename.
Conflicts:
arch/arm/mach-mx2/clock_imx27.c
arch/arm/mach-mx2/devices.c
arch/arm/mach-omap2/board-rx51-peripherals.c
arch/arm/mach-omap2/board-zoom2.c
sound/soc/fsl/mpc5200_dma.c
sound/soc/fsl/mpc5200_dma.h
sound/soc/fsl/mpc8610_hpcd.c
sound/soc/pxa/spitz.c
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/Kbuild | 9 | ||||
| -rw-r--r-- | include/sound/asound.h | 6 | ||||
| -rw-r--r-- | include/sound/pcm.h | 8 |
3 files changed, 15 insertions, 8 deletions
diff --git a/include/sound/Kbuild b/include/sound/Kbuild index e9dd9369ecb9..802947f60915 100644 --- a/include/sound/Kbuild +++ b/include/sound/Kbuild | |||
| @@ -1,9 +1,8 @@ | |||
| 1 | header-y += asequencer.h | ||
| 2 | header-y += asound.h | ||
| 1 | header-y += asound_fm.h | 3 | header-y += asound_fm.h |
| 4 | header-y += emu10k1.h | ||
| 2 | header-y += hdsp.h | 5 | header-y += hdsp.h |
| 3 | header-y += hdspm.h | 6 | header-y += hdspm.h |
| 7 | header-y += sb16_csp.h | ||
| 4 | header-y += sfnt_info.h | 8 | header-y += sfnt_info.h |
| 5 | |||
| 6 | unifdef-y += asequencer.h | ||
| 7 | unifdef-y += asound.h | ||
| 8 | unifdef-y += emu10k1.h | ||
| 9 | unifdef-y += sb16_csp.h | ||
diff --git a/include/sound/asound.h b/include/sound/asound.h index 9f1eecf99e6b..a1803ecea34d 100644 --- a/include/sound/asound.h +++ b/include/sound/asound.h | |||
| @@ -212,7 +212,11 @@ typedef int __bitwise snd_pcm_format_t; | |||
| 212 | #define SNDRV_PCM_FORMAT_S18_3BE ((__force snd_pcm_format_t) 41) /* in three bytes */ | 212 | #define SNDRV_PCM_FORMAT_S18_3BE ((__force snd_pcm_format_t) 41) /* in three bytes */ |
| 213 | #define SNDRV_PCM_FORMAT_U18_3LE ((__force snd_pcm_format_t) 42) /* in three bytes */ | 213 | #define SNDRV_PCM_FORMAT_U18_3LE ((__force snd_pcm_format_t) 42) /* in three bytes */ |
| 214 | #define SNDRV_PCM_FORMAT_U18_3BE ((__force snd_pcm_format_t) 43) /* in three bytes */ | 214 | #define SNDRV_PCM_FORMAT_U18_3BE ((__force snd_pcm_format_t) 43) /* in three bytes */ |
| 215 | #define SNDRV_PCM_FORMAT_LAST SNDRV_PCM_FORMAT_U18_3BE | 215 | #define SNDRV_PCM_FORMAT_G723_24 ((__force snd_pcm_format_t) 44) /* 8 samples in 3 bytes */ |
| 216 | #define SNDRV_PCM_FORMAT_G723_24_1B ((__force snd_pcm_format_t) 45) /* 1 sample in 1 byte */ | ||
| 217 | #define SNDRV_PCM_FORMAT_G723_40 ((__force snd_pcm_format_t) 46) /* 8 Samples in 5 bytes */ | ||
| 218 | #define SNDRV_PCM_FORMAT_G723_40_1B ((__force snd_pcm_format_t) 47) /* 1 sample in 1 byte */ | ||
| 219 | #define SNDRV_PCM_FORMAT_LAST SNDRV_PCM_FORMAT_G723_40_1B | ||
| 216 | 220 | ||
| 217 | #ifdef SNDRV_LITTLE_ENDIAN | 221 | #ifdef SNDRV_LITTLE_ENDIAN |
| 218 | #define SNDRV_PCM_FORMAT_S16 SNDRV_PCM_FORMAT_S16_LE | 222 | #define SNDRV_PCM_FORMAT_S16 SNDRV_PCM_FORMAT_S16_LE |
diff --git a/include/sound/pcm.h b/include/sound/pcm.h index dd76cdede64d..85f1c6bf8566 100644 --- a/include/sound/pcm.h +++ b/include/sound/pcm.h | |||
| @@ -174,6 +174,10 @@ struct snd_pcm_ops { | |||
| 174 | #define SNDRV_PCM_FMTBIT_U18_3LE (1ULL << SNDRV_PCM_FORMAT_U18_3LE) | 174 | #define SNDRV_PCM_FMTBIT_U18_3LE (1ULL << SNDRV_PCM_FORMAT_U18_3LE) |
| 175 | #define SNDRV_PCM_FMTBIT_S18_3BE (1ULL << SNDRV_PCM_FORMAT_S18_3BE) | 175 | #define SNDRV_PCM_FMTBIT_S18_3BE (1ULL << SNDRV_PCM_FORMAT_S18_3BE) |
| 176 | #define SNDRV_PCM_FMTBIT_U18_3BE (1ULL << SNDRV_PCM_FORMAT_U18_3BE) | 176 | #define SNDRV_PCM_FMTBIT_U18_3BE (1ULL << SNDRV_PCM_FORMAT_U18_3BE) |
| 177 | #define SNDRV_PCM_FMTBIT_G723_24 (1ULL << SNDRV_PCM_FORMAT_G723_24) | ||
| 178 | #define SNDRV_PCM_FMTBIT_G723_24_1B (1ULL << SNDRV_PCM_FORMAT_G723_24_1B) | ||
| 179 | #define SNDRV_PCM_FMTBIT_G723_40 (1ULL << SNDRV_PCM_FORMAT_G723_40) | ||
| 180 | #define SNDRV_PCM_FMTBIT_G723_40_1B (1ULL << SNDRV_PCM_FORMAT_G723_40_1B) | ||
| 177 | 181 | ||
| 178 | #ifdef SNDRV_LITTLE_ENDIAN | 182 | #ifdef SNDRV_LITTLE_ENDIAN |
| 179 | #define SNDRV_PCM_FMTBIT_S16 SNDRV_PCM_FMTBIT_S16_LE | 183 | #define SNDRV_PCM_FMTBIT_S16 SNDRV_PCM_FMTBIT_S16_LE |
| @@ -313,7 +317,7 @@ struct snd_pcm_runtime { | |||
| 313 | struct snd_pcm_mmap_control *control; | 317 | struct snd_pcm_mmap_control *control; |
| 314 | 318 | ||
| 315 | /* -- locking / scheduling -- */ | 319 | /* -- locking / scheduling -- */ |
| 316 | unsigned int twake: 1; /* do transfer (!poll) wakeup */ | 320 | snd_pcm_uframes_t twake; /* do transfer (!poll) wakeup if non-zero */ |
| 317 | wait_queue_head_t sleep; /* poll sleep */ | 321 | wait_queue_head_t sleep; /* poll sleep */ |
| 318 | wait_queue_head_t tsleep; /* transfer sleep */ | 322 | wait_queue_head_t tsleep; /* transfer sleep */ |
| 319 | struct fasync_struct *fasync; | 323 | struct fasync_struct *fasync; |
| @@ -366,7 +370,7 @@ struct snd_pcm_substream { | |||
| 366 | int number; | 370 | int number; |
| 367 | char name[32]; /* substream name */ | 371 | char name[32]; /* substream name */ |
| 368 | int stream; /* stream (direction) */ | 372 | int stream; /* stream (direction) */ |
| 369 | struct pm_qos_request_list *latency_pm_qos_req; /* pm_qos request */ | 373 | struct pm_qos_request_list latency_pm_qos_req; /* pm_qos request */ |
| 370 | size_t buffer_bytes_max; /* limit ring buffer size */ | 374 | size_t buffer_bytes_max; /* limit ring buffer size */ |
| 371 | struct snd_dma_buffer dma_buffer; | 375 | struct snd_dma_buffer dma_buffer; |
| 372 | unsigned int dma_buf_id; | 376 | unsigned int dma_buf_id; |