CHROMIUM: ASoC: Import entire upstream ASoC tree

include/sound/soc.h

 /*
  * linux/sound/soc.h -- ALSA SoC Layer
  *
  * Author:              Liam Girdwood
  * Created:             Aug 11th 2005
  * Copyright:   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.
@@ skipping 204 matching lines @@
  */
 enum snd_soc_bias_level {
         SND_SOC_BIAS_OFF,
         SND_SOC_BIAS_STANDBY,
         SND_SOC_BIAS_PREPARE,
         SND_SOC_BIAS_ON,
 };
 
 struct snd_jack;
 struct snd_soc_card;
-struct snd_soc_device;
 struct snd_soc_pcm_stream;
 struct snd_soc_ops;
-struct snd_soc_dai_mode;
 struct snd_soc_pcm_runtime;
 struct snd_soc_dai;
 struct snd_soc_dai_driver;
 struct snd_soc_platform;
 struct snd_soc_dai_link;
 struct snd_soc_platform_driver;
 struct snd_soc_codec;
 struct snd_soc_codec_driver;
 struct soc_enum;
-struct snd_soc_ac97_ops;
 struct snd_soc_jack;
+struct snd_soc_jack_zone;
 struct snd_soc_jack_pin;
+struct snd_soc_cache_ops;
+#include <sound/soc-dapm.h>
 
 #ifdef CONFIG_GPIOLIB
 struct snd_soc_jack_gpio;
 #endif
 
 typedef int (*hw_write_t)(void *,const char* ,int);
 
 extern struct snd_ac97_bus_ops soc_ac97_ops;
 
 enum snd_soc_control_type {
         SND_SOC_CUSTOM,
         SND_SOC_I2C,
         SND_SOC_SPI,
 };
 
+enum snd_soc_compress_type {
+        SND_SOC_FLAT_COMPRESSION = 1,
+        SND_SOC_LZO_COMPRESSION,
+        SND_SOC_RBTREE_COMPRESSION
+};
+
+int snd_soc_register_card(struct snd_soc_card *card);
+int snd_soc_unregister_card(struct snd_soc_card *card);
+int snd_soc_suspend(struct device *dev);
+int snd_soc_resume(struct device *dev);
+int snd_soc_poweroff(struct device *dev);
 int snd_soc_register_platform(struct device *dev,
                 struct snd_soc_platform_driver *platform_drv);
 void snd_soc_unregister_platform(struct device *dev);
 int snd_soc_register_codec(struct device *dev,
-                struct snd_soc_codec_driver *codec_drv,
+                const struct snd_soc_codec_driver *codec_drv,
                 struct snd_soc_dai_driver *dai_drv, int num_dai);
 void snd_soc_unregister_codec(struct device *dev);
-int snd_soc_codec_volatile_register(struct snd_soc_codec *codec, int reg);
+int snd_soc_codec_volatile_register(struct snd_soc_codec *codec,
+                                    unsigned int reg);
 int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec,
                                int addr_bits, int data_bits,
                                enum snd_soc_control_type control);
+int snd_soc_cache_sync(struct snd_soc_codec *codec);
+int snd_soc_cache_init(struct snd_soc_codec *codec);
+int snd_soc_cache_exit(struct snd_soc_codec *codec);
+int snd_soc_cache_write(struct snd_soc_codec *codec,
+                        unsigned int reg, unsigned int value);
+int snd_soc_cache_read(struct snd_soc_codec *codec,
+                       unsigned int reg, unsigned int *value);
+int snd_soc_default_volatile_register(struct snd_soc_codec *codec,
+                                      unsigned int reg);
+int snd_soc_default_readable_register(struct snd_soc_codec *codec,
+                                      unsigned int reg);
 
 /* Utility functions to get clock rates from various things */
 int snd_soc_calc_frame_size(int sample_size, int channels, int tdm_slots);
 int snd_soc_params_to_frame_size(struct snd_pcm_hw_params *params);
 int snd_soc_calc_bclk(int fs, int sample_size, int channels, int tdm_slots);
 int snd_soc_params_to_bclk(struct snd_pcm_hw_params *parms);
 
 /* set runtime hw params */
 int snd_soc_set_runtime_hwparams(struct snd_pcm_substream *substream,
         const struct snd_pcm_hardware *hw);
 
 /* Jack reporting */
 int snd_soc_jack_new(struct snd_soc_codec *codec, const char *id, int type,
                      struct snd_soc_jack *jack);
 void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask);
 int snd_soc_jack_add_pins(struct snd_soc_jack *jack, int count,
                           struct snd_soc_jack_pin *pins);
 void snd_soc_jack_notifier_register(struct snd_soc_jack *jack,
                                     struct notifier_block *nb);
 void snd_soc_jack_notifier_unregister(struct snd_soc_jack *jack,
                                       struct notifier_block *nb);
+int snd_soc_jack_add_zones(struct snd_soc_jack *jack, int count,
+                          struct snd_soc_jack_zone *zones);
+int snd_soc_jack_get_type(struct snd_soc_jack *jack, int micbias_voltage);
 #ifdef CONFIG_GPIOLIB
 int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count,
                         struct snd_soc_jack_gpio *gpios);
 void snd_soc_jack_free_gpios(struct snd_soc_jack *jack, int count,
                         struct snd_soc_jack_gpio *gpios);
 #endif
 
 /* codec register bit access */
 int snd_soc_update_bits(struct snd_soc_codec *codec, unsigned short reg,
                                 unsigned int mask, unsigned int value);
@@ skipping 50 matching lines @@
 int snd_soc_limit_volume(struct snd_soc_codec *codec,
         const char *name, int max);
 int snd_soc_info_volsw_2r_sx(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_info *uinfo);
 int snd_soc_get_volsw_2r_sx(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol);
 int snd_soc_put_volsw_2r_sx(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol);
 
 /**
+ * struct snd_soc_reg_access - Describes whether a given register is
+ * readable, writable or volatile.
+ *
+ * @reg: the register number
+ * @read: whether this register is readable
+ * @write: whether this register is writable
+ * @vol: whether this register is volatile
+ */
+struct snd_soc_reg_access {
+        u16 reg;
+        u16 read;
+        u16 write;
+        u16 vol;
+};
+
+/**
  * struct snd_soc_jack_pin - Describes a pin to update based on jack detection
  *
  * @pin:    name of the pin to update
  * @mask:   bits to check for in reported jack status
  * @invert: if non-zero then pin is enabled when status is not reported
  */
 struct snd_soc_jack_pin {
         struct list_head list;
         const char *pin;
         int mask;
         bool invert;
 };
 
 /**
+ * struct snd_soc_jack_zone - Describes voltage zones of jack detection
+ *
+ * @min_mv: start voltage in mv
+ * @max_mv: end voltage in mv
+ * @jack_type: type of jack that is expected for this voltage
+ * @debounce_time: debounce_time for jack, codec driver should wait for this
+ *              duration before reading the adc for voltages
+ * @:list: list container
+ */
+struct snd_soc_jack_zone {
+        unsigned int min_mv;
+        unsigned int max_mv;
+        unsigned int jack_type;
+        unsigned int debounce_time;
+        struct list_head list;
+};
+
+/**
  * struct snd_soc_jack_gpio - Describes a gpio pin for jack detection
  *
  * @gpio:         gpio number
  * @name:         gpio name
  * @report:       value to report when jack detected
  * @invert:       report presence in low state
  * @debouce_time: debouce time in ms
  */
 #ifdef CONFIG_GPIOLIB
 struct snd_soc_jack_gpio {
         unsigned int gpio;
         const char *name;
         int report;
         int invert;
         int debounce_time;
         struct snd_soc_jack *jack;
         struct delayed_work work;
 
         int (*jack_status_check)(void);
 };
 #endif
 
 struct snd_soc_jack {
         struct snd_jack *jack;
         struct snd_soc_codec *codec;
         struct list_head pins;
         int status;
         struct blocking_notifier_head notifier;
+        struct list_head jack_zones;
 };
 
 /* SoC PCM stream information */
 struct snd_soc_pcm_stream {
         const char *stream_name;
         u64 formats;                    /* SNDRV_PCM_FMTBIT_* */
         unsigned int rates;             /* SNDRV_PCM_RATE_* */
         unsigned int rate_min;          /* min rate */
         unsigned int rate_max;          /* max rate */
         unsigned int channels_min;      /* min channels */
         unsigned int channels_max;      /* max channels */
 };
 
 /* SoC audio ops */
 struct snd_soc_ops {
         int (*startup)(struct snd_pcm_substream *);
         void (*shutdown)(struct snd_pcm_substream *);
         int (*hw_params)(struct snd_pcm_substream *, struct snd_pcm_hw_params *);
         int (*hw_free)(struct snd_pcm_substream *);
         int (*prepare)(struct snd_pcm_substream *);
         int (*trigger)(struct snd_pcm_substream *, int);
 };
 
+/* SoC cache ops */
+struct snd_soc_cache_ops {
+        const char *name;
+        enum snd_soc_compress_type id;
+        int (*init)(struct snd_soc_codec *codec);
+        int (*exit)(struct snd_soc_codec *codec);
+        int (*read)(struct snd_soc_codec *codec, unsigned int reg,
+                unsigned int *value);
+        int (*write)(struct snd_soc_codec *codec, unsigned int reg,
+                unsigned int value);
+        int (*sync)(struct snd_soc_codec *codec);
+};
+
 /* SoC Audio Codec device */
 struct snd_soc_codec {
         const char *name;
+        const char *name_prefix;
         int id;
         struct device *dev;
-        struct snd_soc_codec_driver *driver;
+        const struct snd_soc_codec_driver *driver;
 
         struct mutex mutex;
         struct snd_soc_card *card;
         struct list_head list;
         struct list_head card_list;
         int num_dai;
+        enum snd_soc_compress_type compress_type;
+        size_t reg_size;        /* reg_cache_size * reg_word_size */
+        int (*volatile_register)(struct snd_soc_codec *, unsigned int);
+        int (*readable_register)(struct snd_soc_codec *, unsigned int);
 
         /* runtime */
         struct snd_ac97 *ac97;  /* for ad-hoc ac97 devices */
         unsigned int active;
-        unsigned int idle_bias_off:1; /* Use BIAS_OFF instead of STANDBY */
-        unsigned int cache_only:1;  /* Suppress writes to hardware */
-        unsigned int cache_sync:1; /* Cache needs to be synced to hardware */
+        unsigned int cache_bypass:1; /* Suppress access to the cache */
         unsigned int suspended:1; /* Codec is in suspend PM state */
         unsigned int probed:1; /* Codec has been probed */
         unsigned int ac97_registered:1; /* Codec has been AC97 registered */
         unsigned int ac97_created:1; /* Codec has been created by SoC */
         unsigned int sysfs_registered:1; /* codec has been sysfs registered */
+        unsigned int cache_init:1; /* codec cache has been initialized */
+        u32 cache_only;  /* Suppress writes to hardware */
+        u32 cache_sync; /* Cache needs to be synced to hardware */
 
         /* codec IO */
         void *control_data; /* codec control (i2c/3wire) data */
         hw_write_t hw_write;
         unsigned int (*hw_read)(struct snd_soc_codec *, unsigned int);
+        unsigned int (*read)(struct snd_soc_codec *, unsigned int);
+        int (*write)(struct snd_soc_codec *, unsigned int, unsigned int);
         void *reg_cache;
+        const void *reg_def_copy;
+        const struct snd_soc_cache_ops *cache_ops;
+        struct mutex cache_rw_mutex;
 
         /* dapm */
-        u32 pop_time;
-        struct list_head dapm_widgets;
-        struct list_head dapm_paths;
-        enum snd_soc_bias_level bias_level;
-        enum snd_soc_bias_level suspend_bias_level;
-        struct delayed_work delayed_work;
+        struct snd_soc_dapm_context dapm;
 
 #ifdef CONFIG_DEBUG_FS
         struct dentry *debugfs_codec_root;
         struct dentry *debugfs_reg;
-        struct dentry *debugfs_pop_time;
         struct dentry *debugfs_dapm;
 #endif
 };
 
 /* codec driver */
 struct snd_soc_codec_driver {
 
         /* driver ops */
         int (*probe)(struct snd_soc_codec *);
         int (*remove)(struct snd_soc_codec *);
         int (*suspend)(struct snd_soc_codec *,
                         pm_message_t state);
         int (*resume)(struct snd_soc_codec *);
 
         /* codec IO */
         unsigned int (*read)(struct snd_soc_codec *, unsigned int);
         int (*write)(struct snd_soc_codec *, unsigned int, unsigned int);
         int (*display_register)(struct snd_soc_codec *, char *,
                                 size_t, unsigned int);
-        int (*volatile_register)(unsigned int);
-        int (*readable_register)(unsigned int);
+        int (*volatile_register)(struct snd_soc_codec *, unsigned int);
+        int (*readable_register)(struct snd_soc_codec *, unsigned int);
         short reg_cache_size;
         short reg_cache_step;
         short reg_word_size;
         const void *reg_cache_default;
+        short reg_access_size;
+        const struct snd_soc_reg_access *reg_access_default;
+        enum snd_soc_compress_type compress_type;
 
         /* codec bias level */
         int (*set_bias_level)(struct snd_soc_codec *,
                               enum snd_soc_bias_level level);
+
+        void (*seq_notifier)(struct snd_soc_dapm_context *,
+                             enum snd_soc_dapm_type, int);
 };
 
 /* SoC platform interface */
 struct snd_soc_platform_driver {
 
         int (*probe)(struct snd_soc_platform *);
         int (*remove)(struct snd_soc_platform *);
         int (*suspend)(struct snd_soc_dai *dai);
         int (*resume)(struct snd_soc_dai *dai);
 
@@ skipping 42 matching lines @@
         /* Symmetry requirements */
         unsigned int symmetric_rates:1;
 
         /* codec/machine specific init - e.g. add machine controls */
         int (*init)(struct snd_soc_pcm_runtime *rtd);
 
         /* machine stream operations */
         struct snd_soc_ops *ops;
 };
 
+struct snd_soc_codec_conf {
+        const char *dev_name;
+
+        /*
+         * optional map of kcontrol, widget and path name prefixes that are
+         * associated per device
+         */
+        const char *name_prefix;
+
+        /*
+         * set this to the desired compression type if you want to
+         * override the one supplied in codec->driver->compress_type
+         */
+        enum snd_soc_compress_type compress_type;
+};
+
+struct snd_soc_aux_dev {
+        const char *name;               /* Codec name */
+        const char *codec_name;         /* for multi-codec */
+
+        /* codec/machine specific init - e.g. add machine controls */
+        int (*init)(struct snd_soc_dapm_context *dapm);
+};
+
 /* SoC card */
 struct snd_soc_card {
         const char *name;
         struct device *dev;
         struct snd_card *snd_card;
         struct module *owner;
 
         struct list_head list;
         struct mutex mutex;
 
         bool instantiated;
 
-        int (*probe)(struct platform_device *pdev);
-        int (*remove)(struct platform_device *pdev);
+        int (*probe)(struct snd_soc_card *card);
+        int (*remove)(struct snd_soc_card *card);
 
         /* the pre and post PM functions are used to do any PM work before and
          * after the codec and DAI's do any PM work. */
-        int (*suspend_pre)(struct platform_device *pdev, pm_message_t state);
-        int (*suspend_post)(struct platform_device *pdev, pm_message_t state);
-        int (*resume_pre)(struct platform_device *pdev);
-        int (*resume_post)(struct platform_device *pdev);
+        int (*suspend_pre)(struct snd_soc_card *card);
+        int (*suspend_post)(struct snd_soc_card *card);
+        int (*resume_pre)(struct snd_soc_card *card);
+        int (*resume_post)(struct snd_soc_card *card);
 
         /* callbacks */
         int (*set_bias_level)(struct snd_soc_card *,
                               enum snd_soc_bias_level level);
+        int (*set_bias_level_post)(struct snd_soc_card *,
+                                   enum snd_soc_bias_level level);
 
         long pmdown_time;
 
         /* CPU <--> Codec DAI links  */
         struct snd_soc_dai_link *dai_link;
         int num_links;
         struct snd_soc_pcm_runtime *rtd;
         int num_rtd;
 
+        /* optional codec specific configuration */
+        struct snd_soc_codec_conf *codec_conf;
+        int num_configs;
+
+        /*
+         * optional auxiliary devices such as amplifiers or codecs with DAI
+         * link unused
+         */
+        struct snd_soc_aux_dev *aux_dev;
+        int num_aux_devs;
+        struct snd_soc_pcm_runtime *rtd_aux;
+        int num_aux_rtd;
+
         struct work_struct deferred_resume_work;
 
         /* lists of probed devices belonging to this card */
         struct list_head codec_dev_list;
         struct list_head platform_dev_list;
         struct list_head dai_dev_list;
+
+        struct list_head widgets;
+        struct list_head paths;
+        struct list_head dapm_list;
+
+#ifdef CONFIG_DEBUG_FS
+        struct dentry *debugfs_card_root;
+        struct dentry *debugfs_pop_time;
+#endif
+        u32 pop_time;
+
+        void *drvdata;
 };
 
 /* SoC machine DAI configuration, glues a codec and cpu DAI together */
 struct snd_soc_pcm_runtime  {
         struct device dev;
         struct snd_soc_card *card;
         struct snd_soc_dai_link *dai_link;
 
         unsigned int complete:1;
         unsigned int dev_registered:1;
@@ skipping 25 matching lines @@
         unsigned char shift_l;
         unsigned char shift_r;
         unsigned int max;
         unsigned int mask;
         const char **texts;
         const unsigned int *values;
         void *dapm;
 };
 
 /* codec IO */
-static inline unsigned int snd_soc_read(struct snd_soc_codec *codec,
-                                        unsigned int reg)
+unsigned int snd_soc_read(struct snd_soc_codec *codec, unsigned int reg);
+unsigned int snd_soc_write(struct snd_soc_codec *codec,
+                           unsigned int reg, unsigned int val);
+
+/* device driver data */
+
+static inline void snd_soc_card_set_drvdata(struct snd_soc_card *card,
+                void *data)
 {
-        return codec->driver->read(codec, reg);
+        card->drvdata = data;
 }
 
-static inline unsigned int snd_soc_write(struct snd_soc_codec *codec,
-                                         unsigned int reg, unsigned int val)
+static inline void *snd_soc_card_get_drvdata(struct snd_soc_card *card)
 {
-        return codec->driver->write(codec, reg, val);
+        return card->drvdata;
 }
 
-/* device driver data */
-
 static inline void snd_soc_codec_set_drvdata(struct snd_soc_codec *codec,
                 void *data)
 {
         dev_set_drvdata(codec->dev, data);
 }
 
 static inline void *snd_soc_codec_get_drvdata(struct snd_soc_codec *codec)
 {
         return dev_get_drvdata(codec->dev);
 }
@@ skipping 13 matching lines @@
                 void *data)
 {
         dev_set_drvdata(&rtd->dev, data);
 }
 
 static inline void *snd_soc_pcm_get_drvdata(struct snd_soc_pcm_runtime *rtd)
 {
         return dev_get_drvdata(&rtd->dev);
 }
 
+static inline void snd_soc_initialize_card_lists(struct snd_soc_card *card)
+{
+        INIT_LIST_HEAD(&card->dai_dev_list);
+        INIT_LIST_HEAD(&card->codec_dev_list);
+        INIT_LIST_HEAD(&card->platform_dev_list);
+        INIT_LIST_HEAD(&card->widgets);
+        INIT_LIST_HEAD(&card->paths);
+        INIT_LIST_HEAD(&card->dapm_list);
+}
+
 #include <sound/soc-dai.h>
 
 #ifdef CONFIG_DEBUG_FS
-extern struct dentry *asoc_debugfs_root;
+extern struct dentry *snd_soc_debugfs_root;
 #endif
 
+extern const struct dev_pm_ops snd_soc_pm_ops;
+
 #endif