CHROMIUM: ASoC: Import entire upstream ASoC tree

include/sound/soc-dai.h

 /*
  * linux/sound/soc-dai.h -- ALSA SoC Layer
  *
  * Copyright:   2005-2008 Wolfson Microelectronics. PLC.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  *
  * Digital Audio Interface (DAI) API.
  */
 
 #ifndef __LINUX_SND_SOC_DAI_H
 #define __LINUX_SND_SOC_DAI_H
 
 
 #include <linux/list.h>
 
-#include <sound/soc.h>
-
 struct snd_pcm_substream;
 
 /*
  * DAI hardware audio formats.
  *
  * Describes the physical PCM data formating and clocking. Add new formats
  * to the end.
  */
 #define SND_SOC_DAIFMT_I2S              0 /* I2S mode */
 #define SND_SOC_DAIFMT_RIGHT_J          1 /* Right Justified mode */
@@ skipping 167 matching lines @@
         unsigned int id;
         int ac97_control;
 
         /* DAI driver callbacks */
         int (*probe)(struct snd_soc_dai *dai);
         int (*remove)(struct snd_soc_dai *dai);
         int (*suspend)(struct snd_soc_dai *dai);
         int (*resume)(struct snd_soc_dai *dai);
 
         /* ops */
-        struct snd_soc_dai_ops *ops;
+        const struct snd_soc_dai_ops *ops;
 
         /* DAI capabilities */
         struct snd_soc_pcm_stream capture;
         struct snd_soc_pcm_stream playback;
         unsigned int symmetric_rates:1;
 };
 
 /*
  * Digital Audio Interface runtime data.
  *
@@ skipping 54 matching lines @@
 {
         dev_set_drvdata(dai->dev, data);
 }
 
 static inline void *snd_soc_dai_get_drvdata(struct snd_soc_dai *dai)
 {
         return dev_get_drvdata(dai->dev);
 }
 
 #endif