5 files changed, 158 insertions, 6 deletions

diff --git a/include/sound/max98095.h b/include/sound/max98095.h
new file mode 100644
index 000000000000..7513a42dd4aa
--- /dev/null
+++ b/include/sound/max98095.h
@@ -0,0 +1,54 @@
+/*
+ * Platform data for MAX98095
+ *
+ * Copyright 2011 Maxim Integrated Products
+ *
+ *  This program is free software; you can redistribute  it and/or modify it
+ *  under  the terms of  the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the  License, or (at your
+ *  option) any later version.
+ *
+ */
+
+#ifndef __SOUND_MAX98095_PDATA_H__
+#define __SOUND_MAX98095_PDATA_H__
+
+/* Equalizer filter response configuration */
+struct max98095_eq_cfg {
+        const char *name;
+        unsigned int rate;
+        u16 band1[5];
+        u16 band2[5];
+        u16 band3[5];
+        u16 band4[5];
+        u16 band5[5];
+};
+
+/* Biquad filter response configuration */
+struct max98095_biquad_cfg {
+        const char *name;
+        unsigned int rate;
+        u16 band1[5];
+        u16 band2[5];
+};
+
+/* codec platform data */
+struct max98095_pdata {
+
+        /* Equalizers for DAI1 and DAI2 */
+        struct max98095_eq_cfg *eq_cfg;
+        unsigned int eq_cfgcnt;
+
+        /* Biquad filter for DAI1 and DAI2 */
+        struct max98095_biquad_cfg *bq_cfg;
+        unsigned int bq_cfgcnt;
+
+        /* Analog/digital microphone configuration:
+         * 0 = analog microphone input (normal setting)
+         * 1 = digital microphone input
+         */
+        unsigned int digmic_left_mode:1;
+        unsigned int digmic_right_mode:1;
+};
+
+#endif
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index f72c1039a6fb..f8a7c9a6f12a 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -24,7 +24,7 @@
  * SoC dynamic audio power management
  *
  * We can have up to 4 power domains
- *      1. Codec domain - VREF, VMID
+ *  1. Codec domain - VREF, VMID
  *     Usually controlled at codec probe/remove, although can be set
  *     at stream time if power is not needed for sidetone, etc.
  *  2. Platform/Machine domain - physically connected inputs and outputs
@@ -356,7 +356,8 @@ void snd_soc_dapm_shutdown(struct snd_soc_card *card);
 
 /* dapm sys fs - used by the core */
 int snd_soc_dapm_sys_add(struct device *dev);
-void snd_soc_dapm_debugfs_init(struct snd_soc_dapm_context *dapm);
+void snd_soc_dapm_debugfs_init(struct snd_soc_dapm_context *dapm,
+                                struct dentry *parent);
 
 /* dapm audio pin control and status */
 int snd_soc_dapm_enable_pin(struct snd_soc_dapm_context *dapm,
diff --git a/include/sound/soc.h b/include/sound/soc.h
index bfa4836ea107..6ce3e573fb40 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -248,7 +248,7 @@ 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_CUSTOM = 1,
         SND_SOC_I2C,
         SND_SOC_SPI,
 };
@@ -278,6 +278,10 @@ int snd_soc_register_codec(struct device *dev,
 void snd_soc_unregister_codec(struct device *dev);
 int snd_soc_codec_volatile_register(struct snd_soc_codec *codec,
                                     unsigned int reg);
+int snd_soc_codec_readable_register(struct snd_soc_codec *codec,
+                                    unsigned int reg);
+int snd_soc_codec_writable_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);
@@ -292,6 +296,8 @@ 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);
+int snd_soc_default_writable_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);
@@ -523,6 +529,7 @@ struct snd_soc_codec {
         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);
+        int (*writable_register)(struct snd_soc_codec *, unsigned int);
 
         /* runtime */
         struct snd_ac97 *ac97;  /* for ad-hoc ac97 devices */
@@ -539,10 +546,12 @@ struct snd_soc_codec {
 
         /* codec IO */
         void *control_data; /* codec control (i2c/3wire) data */
+        enum snd_soc_control_type control_type;
         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);
+        int (*bulk_write_raw)(struct snd_soc_codec *, unsigned int, const void *, size_t);
         void *reg_cache;
         const void *reg_def_copy;
         const struct snd_soc_cache_ops *cache_ops;
@@ -568,7 +577,9 @@ struct snd_soc_codec_driver {
                         pm_message_t state);
         int (*resume)(struct snd_soc_codec *);
 
-        /* Default DAPM setup, added after probe() is run */
+        /* Default control and setup, added after probe() is run */
+        const struct snd_kcontrol_new *controls;
+        int num_controls;
         const struct snd_soc_dapm_widget *dapm_widgets;
         int num_dapm_widgets;
         const struct snd_soc_dapm_route *dapm_routes;
@@ -587,6 +598,7 @@ struct snd_soc_codec_driver {
                                 size_t, unsigned int);
         int (*volatile_register)(struct snd_soc_codec *, unsigned int);
         int (*readable_register)(struct snd_soc_codec *, unsigned int);
+        int (*writable_register)(struct snd_soc_codec *, unsigned int);
         short reg_cache_size;
         short reg_cache_step;
         short reg_word_size;
@@ -737,12 +749,15 @@ struct snd_soc_card {
         struct snd_soc_pcm_runtime *rtd_aux;
         int num_aux_rtd;
 
+        const struct snd_kcontrol_new *controls;
+        int num_controls;
+
         /*
          * Card-specific routes and widgets.
          */
-        struct snd_soc_dapm_widget *dapm_widgets;
+        const struct snd_soc_dapm_widget *dapm_widgets;
         int num_dapm_widgets;
-        struct snd_soc_dapm_route *dapm_routes;
+        const struct snd_soc_dapm_route *dapm_routes;
         int num_dapm_routes;
 
         struct work_struct deferred_resume_work;
@@ -814,6 +829,8 @@ struct soc_enum {
 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);
+unsigned int snd_soc_bulk_write_raw(struct snd_soc_codec *codec,
+                                    unsigned int reg, const void *data, size_t len);
 
 /* device driver data */
 
@@ -871,6 +888,9 @@ static inline void snd_soc_initialize_card_lists(struct snd_soc_card *card)
         INIT_LIST_HEAD(&card->dapm_list);
 }
 
+int snd_soc_util_init(void);
+void snd_soc_util_exit(void);
+
 #include <sound/soc-dai.h>
 
 #ifdef CONFIG_DEBUG_FS
diff --git a/include/sound/wm8915.h b/include/sound/wm8915.h
new file mode 100644
index 000000000000..5817d762f6f3
--- /dev/null
+++ b/include/sound/wm8915.h
@@ -0,0 +1,55 @@
+/*
+ * linux/sound/wm8915.h -- Platform data for WM8915
+ *
+ * Copyright 2011 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.
+ */
+
+#ifndef __LINUX_SND_WM8903_H
+#define __LINUX_SND_WM8903_H
+
+enum wm8915_inmode {
+        WM8915_DIFFERRENTIAL_1 = 0,   /* IN1xP - IN1xN */
+        WM8915_INVERTING = 1,         /* IN1xN */
+        WM8915_NON_INVERTING = 2,     /* IN1xP */
+        WM8915_DIFFERENTIAL_2 = 3,    /* IN2xP - IN2xP */
+};
+
+/**
+ * ReTune Mobile configurations are specified with a label, sample
+ * rate and set of values to write (the enable bits will be ignored).
+ *
+ * Configurations are expected to be generated using the ReTune Mobile
+ * control panel in WISCE - see http://www.wolfsonmicro.com/wisce/
+ */
+struct wm8915_retune_mobile_config {
+        const char *name;
+        int rate;
+        u16 regs[20];
+};
+
+#define WM8915_SET_DEFAULT 0x10000
+
+struct wm8915_pdata {
+        int irq_flags;  /** Set IRQ trigger flags; default active low */
+
+        int ldo_ena;  /** GPIO for LDO1; -1 for none */
+
+        int micdet_def;  /** Default MICDET_SRC/HP1FB_SRC/MICD_BIAS */
+
+        enum wm8915_inmode inl_mode;
+        enum wm8915_inmode inr_mode;
+
+        u32 spkmute_seq;  /** Value for register 0x802 */
+
+        int gpio_base;
+        u32 gpio_default[5];
+
+        int num_retune_mobile_cfgs;
+        struct wm8915_retune_mobile_config *retune_mobile_cfgs;
+};
+
+#endif
diff --git a/include/sound/wm8962.h b/include/sound/wm8962.h
index 2b5306c503fb..1750bed7c2f6 100644
--- a/include/sound/wm8962.h
+++ b/include/sound/wm8962.h
@@ -14,6 +14,28 @@
 /* Use to set GPIO default values to zero */
 #define WM8962_GPIO_SET 0x10000
 
+#define WM8962_GPIO_FN_CLKOUT           0
+#define WM8962_GPIO_FN_LOGIC            1
+#define WM8962_GPIO_FN_SDOUT            2
+#define WM8962_GPIO_FN_IRQ              3
+#define WM8962_GPIO_FN_THERMAL          4
+#define WM8962_GPIO_FN_PLL2_LOCK        6
+#define WM8962_GPIO_FN_PLL3_LOCK        7
+#define WM8962_GPIO_FN_FLL_LOCK         9
+#define WM8962_GPIO_FN_DRC_ACT         10
+#define WM8962_GPIO_FN_WSEQ_DONE       11
+#define WM8962_GPIO_FN_ALC_NG_ACT      12
+#define WM8962_GPIO_FN_ALC_PEAK_LIMIT  13
+#define WM8962_GPIO_FN_ALC_SATURATION  14
+#define WM8962_GPIO_FN_ALC_LEVEL_THR   15
+#define WM8962_GPIO_FN_ALC_LEVEL_LOCK  16
+#define WM8962_GPIO_FN_FIFO_ERR        17
+#define WM8962_GPIO_FN_OPCLK           18
+#define WM8962_GPIO_FN_DMICCLK         19
+#define WM8962_GPIO_FN_DMICDAT         20
+#define WM8962_GPIO_FN_MICD            21
+#define WM8962_GPIO_FN_MICSCD          22
+
 struct wm8962_pdata {
         int gpio_base;
         u32 gpio_init[WM8962_MAX_GPIO];