Merge branch 'doc' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[cascardo/linux.git] / include / sound / soc-dai.h

diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index c429f24..1f69e0a 100644 (file)
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -173,6 +173,8 @@ struct snd_soc_dai_ops {
                struct snd_soc_dai *);
        int (*trigger)(struct snd_pcm_substream *, int,
                struct snd_soc_dai *);
+       int (*bespoke_trigger)(struct snd_pcm_substream *, int,
+               struct snd_soc_dai *);
        /*
         * For hardware based FIFO caused delay reporting.
         * Optional.
@@ -196,6 +198,7 @@ struct snd_soc_dai_driver {
        const char *name;
        unsigned int id;
        int ac97_control;
+       unsigned int base;
 
        /* DAI driver callbacks */
        int (*probe)(struct snd_soc_dai *dai);
@@ -241,6 +244,7 @@ struct snd_soc_dai {
 
        struct snd_soc_dapm_widget *playback_widget;
        struct snd_soc_dapm_widget *capture_widget;
+       struct snd_soc_dapm_context dapm;
 
        /* DAI DMA data */
        void *playback_dma_data;