diff options
| author | Takashi Iwai <tiwai@suse.de> | 2018-08-13 06:12:31 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2018-08-13 06:12:31 -0400 |
| commit | f5b6c1fcb42fe7d6f2f6eb2220512e2a5f875133 (patch) | |
| tree | 325f29d9788e80a0dd66d907ce38650834060e4b /include/linux/platform_data | |
| parent | 73b383141d296c55bfbc0ce336a4a946627e7780 (diff) | |
| parent | 4aa5db22d35588e1a5d2ee88472348ea73d9fb23 (diff) | |
Merge tag 'asoc-v4.19' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v4.19
A fairly big update, including quite a bit of core activity this time
around (which is good to see) along with a fairly large set of new
drivers.
- A new snd_pcm_stop_xrun() helper which is now used in several
drivers.
- Support for providing name prefixes to generic component nodes.
- Quite a few fixes for DPCM as it gains a bit wider use and more
robust testing.
- Generalization of the DIO2125 support to a simple amplifier driver.
- Accessory detection support for the audio graph card.
- DT support for PXA AC'97 devices.
- Quirks for a number of new x86 systems.
- Support for AM Logic Meson, Everest ES7154, Intel systems with
RT5682, Qualcomm QDSP6 and WCD9335, Realtek RT5682 and TI TAS5707.
Diffstat (limited to 'include/linux/platform_data')
| -rw-r--r-- | include/linux/platform_data/mmp_dma.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/platform_data/mmp_dma.h b/include/linux/platform_data/mmp_dma.h index d1397c8ed94e..6397b9c8149a 100644 --- a/include/linux/platform_data/mmp_dma.h +++ b/include/linux/platform_data/mmp_dma.h | |||
| @@ -12,9 +12,13 @@ | |||
| 12 | #ifndef MMP_DMA_H | 12 | #ifndef MMP_DMA_H |
| 13 | #define MMP_DMA_H | 13 | #define MMP_DMA_H |
| 14 | 14 | ||
| 15 | struct dma_slave_map; | ||
| 16 | |||
| 15 | struct mmp_dma_platdata { | 17 | struct mmp_dma_platdata { |
| 16 | int dma_channels; | 18 | int dma_channels; |
| 17 | int nb_requestors; | 19 | int nb_requestors; |
| 20 | int slave_map_cnt; | ||
| 21 | const struct dma_slave_map *slave_map; | ||
| 18 | }; | 22 | }; |
| 19 | 23 | ||
| 20 | #endif /* MMP_DMA_H */ | 24 | #endif /* MMP_DMA_H */ |
