9 files changed, 284 insertions, 71 deletions

diff --git a/include/sound/cs42l56.h b/include/sound/cs42l56.h
new file mode 100644
index 000000000000..2467c8ff132c
--- /dev/null
+++ b/include/sound/cs42l56.h
@@ -0,0 +1,48 @@
+/*
+ * linux/sound/cs42l56.h -- Platform data for CS42L56
+ *
+ * Copyright (c) 2014 Cirrus Logic Inc.
+ *
+ * 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 __CS42L56_H
+#define __CS42L56_H
+
+struct cs42l56_platform_data {
+
+        /* GPIO for Reset */
+        unsigned int gpio_nreset;
+
+        /* MICBIAS Level. Check datasheet Pg48 */
+        unsigned int micbias_lvl;
+
+        /* Analog Input 1A Reference 0=Single 1=Pseudo-Differential */
+        unsigned int ain1a_ref_cfg;
+
+        /* Analog Input 2A Reference 0=Single 1=Pseudo-Differential */
+        unsigned int ain2a_ref_cfg;
+
+        /* Analog Input 1B Reference 0=Single 1=Pseudo-Differential */
+        unsigned int ain1b_ref_cfg;
+
+        /* Analog Input 2B Reference 0=Single 1=Pseudo-Differential */
+        unsigned int ain2b_ref_cfg;
+
+        /* Charge Pump Freq. Check datasheet Pg62 */
+        unsigned int chgfreq;
+
+        /* HighPass Filter Right Channel Corner Frequency */
+        unsigned int hpfb_freq;
+
+        /* HighPass Filter Left Channel Corner Frequency */
+        unsigned int hpfa_freq;
+
+        /* Adaptive Power Control for LO/HP */
+        unsigned int adaptive_pwr;
+
+};
+
+#endif /* __CS42L56_H */
diff --git a/include/sound/rcar_snd.h b/include/sound/rcar_snd.h
index 34a3c02a4576..f4a706f82cb7 100644
--- a/include/sound/rcar_snd.h
+++ b/include/sound/rcar_snd.h
@@ -34,47 +34,39 @@
  * B : SSI direction
  */
 #define RSND_SSI_CLK_PIN_SHARE          (1 << 31)
-#define RSND_SSI_PLAY                   (1 << 24)
 
 #define RSND_SSI(_dma_id, _pio_irq, _flags)             \
 { .dma_id = _dma_id, .pio_irq = _pio_irq, .flags = _flags }
-#define RSND_SSI_SET(_dai_id, _dma_id, _pio_irq, _flags)        \
-{ .dai_id = _dai_id, .dma_id = _dma_id, .pio_irq = _pio_irq, .flags = _flags }
 #define RSND_SSI_UNUSED \
-{ .dai_id = -1, .dma_id = -1, .pio_irq = -1, .flags = 0 }
+{ .dma_id = -1, .pio_irq = -1, .flags = 0 }
 
 struct rsnd_ssi_platform_info {
-        int dai_id;     /* will be removed */
         int dma_id;
         int pio_irq;
         u32 flags;
 };
 
-/*
- * flags
- */
-#define RSND_SCU_USE_HPBIF              (1 << 31) /* it needs RSND_SSI_DEPENDENT */
-
 #define RSND_SRC(rate, _dma_id)                                         \
-{ .flags = RSND_SCU_USE_HPBIF, .convert_rate = rate, .dma_id = _dma_id, }
-#define RSND_SRC_SET(rate, _dma_id)             \
-        { .flags = RSND_SCU_USE_HPBIF, .convert_rate = rate, .dma_id = _dma_id, }
+{ .convert_rate = rate, .dma_id = _dma_id, }
 #define RSND_SRC_UNUSED                         \
-        { .flags = 0, .convert_rate = 0, .dma_id = 0, }
-
-#define rsnd_scu_platform_info  rsnd_src_platform_info
-#define src_info                scu_info
-#define src_info_nr             scu_info_nr
+{ .convert_rate = 0, .dma_id = -1, }
 
 struct rsnd_src_platform_info {
-        u32 flags;
         u32 convert_rate; /* sampling rate convert */
         int dma_id; /* for Gen2 SCU */
 };
 
+/*
+ * flags
+ */
+struct rsnd_dvc_platform_info {
+        u32 flags;
+};
+
 struct rsnd_dai_path_info {
         struct rsnd_ssi_platform_info *ssi;
         struct rsnd_src_platform_info *src;
+        struct rsnd_dvc_platform_info *dvc;
 };
 
 struct rsnd_dai_platform_info {
@@ -99,6 +91,8 @@ struct rcar_snd_info {
         int ssi_info_nr;
         struct rsnd_src_platform_info *src_info;
         int src_info_nr;
+        struct rsnd_dvc_platform_info *dvc_info;
+        int dvc_info_nr;
         struct rsnd_dai_platform_info *dai_info;
         int dai_info_nr;
         int (*start)(int id);
diff --git a/include/sound/rt5640.h b/include/sound/rt5640.h
index 27cc75ed67f8..59d26dd81e45 100644
--- a/include/sound/rt5640.h
+++ b/include/sound/rt5640.h
@@ -16,6 +16,10 @@ struct rt5640_platform_data {
         bool in1_diff;
         bool in2_diff;
 
+        bool dmic_en;
+        bool dmic1_data_pin; /* 0 = IN1P; 1 = GPIO3 */
+        bool dmic2_data_pin; /* 0 = IN1N; 1 = GPIO4 */
+
         int ldo1_en; /* GPIO for LDO1_EN */
 };
 
diff --git a/include/sound/rt5645.h b/include/sound/rt5645.h
new file mode 100644
index 000000000000..1de744c242f6
--- /dev/null
+++ b/include/sound/rt5645.h
@@ -0,0 +1,25 @@
+/*
+ * linux/sound/rt5645.h -- Platform data for RT5645
+ *
+ * Copyright 2013 Realtek Microelectronics
+ *
+ * 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_RT5645_H
+#define __LINUX_SND_RT5645_H
+
+struct rt5645_platform_data {
+        /* IN2 can optionally be differential */
+        bool in2_diff;
+
+        bool dmic_en;
+        unsigned int dmic1_data_pin;
+        /* 0 = IN2N; 1 = GPIO5; 2 = GPIO11 */
+        unsigned int dmic2_data_pin;
+        /* 0 = IN2P; 1 = GPIO6; 2 = GPIO10; 3 = GPIO12 */
+};
+
+#endif
diff --git a/include/sound/rt5651.h b/include/sound/rt5651.h
new file mode 100644
index 000000000000..d35de758dfb5
--- /dev/null
+++ b/include/sound/rt5651.h
@@ -0,0 +1,21 @@
+/*
+ * linux/sound/rt286.h -- Platform data for RT286
+ *
+ * Copyright 2013 Realtek Microelectronics
+ *
+ * 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_RT5651_H
+#define __LINUX_SND_RT5651_H
+
+struct rt5651_platform_data {
+        /* IN2 can optionally be differential */
+        bool in2_diff;
+
+        bool dmic_en;
+};
+
+#endif
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index fad76769f153..688f2ba8009f 100644
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -252,7 +252,6 @@ struct snd_soc_dai {
         unsigned int symmetric_rates:1;
         unsigned int symmetric_channels:1;
         unsigned int symmetric_samplebits:1;
-        struct snd_pcm_runtime *runtime;
         unsigned int active;
         unsigned char probed:1;
 
@@ -277,7 +276,6 @@ struct snd_soc_dai {
         struct snd_soc_card *card;
 
         struct list_head list;
-        struct list_head card_list;
 };
 
 static inline void *snd_soc_dai_get_dma_data(const struct snd_soc_dai *dai,
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index ef78f562f4a8..6b59471cdf44 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -107,10 +107,6 @@ struct device;
 {       .id = snd_soc_dapm_mux, .name = wname, \
         SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
         .kcontrol_news = wcontrols, .num_kcontrols = 1}
-#define SND_SOC_DAPM_VIRT_MUX(wname, wreg, wshift, winvert, wcontrols) \
-        SND_SOC_DAPM_MUX(wname, wreg, wshift, winvert, wcontrols)
-#define SND_SOC_DAPM_VALUE_MUX(wname, wreg, wshift, winvert, wcontrols) \
-        SND_SOC_DAPM_MUX(wname, wreg, wshift, winvert, wcontrols)
 
 /* Simplified versions of above macros, assuming wncontrols = ARRAY_SIZE(wcontrols) */
 #define SOC_PGA_ARRAY(wname, wreg, wshift, winvert,\
@@ -166,10 +162,6 @@ struct device;
         SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
         .kcontrol_news = wcontrols, .num_kcontrols = 1, \
         .event = wevent, .event_flags = wflags}
-#define SND_SOC_DAPM_VIRT_MUX_E(wname, wreg, wshift, winvert, wcontrols, \
-        wevent, wflags) \
-        SND_SOC_DAPM_MUX_E(wname, wreg, wshift, winvert, wcontrols, wevent, \
-                wflags)
 
 /* additional sequencing control within an event type */
 #define SND_SOC_DAPM_PGA_S(wname, wsubseq, wreg, wshift, winvert, \
@@ -256,9 +248,8 @@ struct device;
 /* generic widgets */
 #define SND_SOC_DAPM_REG(wid, wname, wreg, wshift, wmask, won_val, woff_val) \
 {       .id = wid, .name = wname, .kcontrol_news = NULL, .num_kcontrols = 0, \
-        .reg = -((wreg) + 1), .shift = wshift, .mask = wmask, \
-        .on_val = won_val, .off_val = woff_val, .event = dapm_reg_event, \
-        .event_flags = SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD}
+        .reg = wreg, .shift = wshift, .mask = wmask, \
+        .on_val = won_val, .off_val = woff_val, }
 #define SND_SOC_DAPM_SUPPLY(wname, wreg, wshift, winvert, wevent, wflags) \
 {       .id = snd_soc_dapm_supply, .name = wname, \
         SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
@@ -305,16 +296,12 @@ struct device;
         .get = snd_soc_dapm_get_enum_double, \
         .put = snd_soc_dapm_put_enum_double, \
         .private_value = (unsigned long)&xenum }
-#define SOC_DAPM_ENUM_VIRT(xname, xenum) \
-        SOC_DAPM_ENUM(xname, xenum)
 #define SOC_DAPM_ENUM_EXT(xname, xenum, xget, xput) \
 {       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
         .info = snd_soc_info_enum_double, \
         .get = xget, \
         .put = xput, \
         .private_value = (unsigned long)&xenum }
-#define SOC_DAPM_VALUE_ENUM(xname, xenum) \
-        SOC_DAPM_ENUM(xname, xenum)
 #define SOC_DAPM_PIN_SWITCH(xname) \
 {       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname " Switch", \
         .info = snd_soc_dapm_info_pin_switch, \
@@ -362,8 +349,6 @@ struct regulator;
 struct snd_soc_dapm_widget_list;
 struct snd_soc_dapm_update;
 
-int dapm_reg_event(struct snd_soc_dapm_widget *w,
-                   struct snd_kcontrol *kcontrol, int event);
 int dapm_regulator_event(struct snd_soc_dapm_widget *w,
                          struct snd_kcontrol *kcontrol, int event);
 int dapm_clock_event(struct snd_soc_dapm_widget *w,
@@ -606,6 +591,7 @@ struct snd_soc_dapm_context {
                              enum snd_soc_dapm_type, int);
 
         struct device *dev; /* from parent - for debug */
+        struct snd_soc_component *component; /* parent component */
         struct snd_soc_codec *codec; /* parent codec */
         struct snd_soc_platform *platform; /* parent platform */
         struct snd_soc_card *card; /* parent card */
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 0b83168d8ff4..df7ae9ca4854 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -196,8 +196,6 @@
         .info = snd_soc_info_enum_double, \
         .get = snd_soc_get_enum_double, .put = snd_soc_put_enum_double, \
         .private_value = (unsigned long)&xenum }
-#define SOC_VALUE_ENUM(xname, xenum) \
-        SOC_ENUM(xname, xenum)
 #define SOC_SINGLE_EXT(xname, xreg, xshift, xmax, xinvert,\
          xhandler_get, xhandler_put) \
 {       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
@@ -266,6 +264,13 @@
                 {.base = xbase, .num_regs = xregs,            \
                  .mask = xmask }) }
 
+#define SND_SOC_BYTES_EXT(xname, xcount, xhandler_get, xhandler_put) \
+{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
+        .info = snd_soc_bytes_info_ext, \
+        .get = xhandler_get, .put = xhandler_put, \
+        .private_value = (unsigned long)&(struct soc_bytes_ext) \
+                {.max = xcount} }
+
 #define SOC_SINGLE_XR_SX(xname, xregbase, xregcount, xnbits, \
                 xmin, xmax, xinvert) \
 {       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), \
@@ -377,6 +382,8 @@ int snd_soc_resume(struct device *dev);
 int snd_soc_poweroff(struct device *dev);
 int snd_soc_register_platform(struct device *dev,
                 const struct snd_soc_platform_driver *platform_drv);
+int devm_snd_soc_register_platform(struct device *dev,
+                const struct snd_soc_platform_driver *platform_drv);
 void snd_soc_unregister_platform(struct device *dev);
 int snd_soc_add_platform(struct device *dev, struct snd_soc_platform *platform,
                 const struct snd_soc_platform_driver *platform_drv);
@@ -393,14 +400,6 @@ int devm_snd_soc_register_component(struct device *dev,
                          const struct snd_soc_component_driver *cmpnt_drv,
                          struct snd_soc_dai_driver *dai_drv, int num_dai);
 void snd_soc_unregister_component(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,
-                               struct regmap *regmap);
 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);
@@ -469,12 +468,12 @@ static inline void snd_soc_jack_free_gpios(struct snd_soc_jack *jack, int count,
 #endif
 
 /* codec register bit access */
-int snd_soc_update_bits(struct snd_soc_codec *codec, unsigned short reg,
+int snd_soc_update_bits(struct snd_soc_codec *codec, unsigned int reg,
                                 unsigned int mask, unsigned int value);
 int snd_soc_update_bits_locked(struct snd_soc_codec *codec,
-                               unsigned short reg, unsigned int mask,
+                               unsigned int reg, unsigned int mask,
                                unsigned int value);
-int snd_soc_test_bits(struct snd_soc_codec *codec, unsigned short reg,
+int snd_soc_test_bits(struct snd_soc_codec *codec, unsigned int reg,
                                 unsigned int mask, unsigned int value);
 
 int snd_soc_new_ac97_codec(struct snd_soc_codec *codec,
@@ -540,6 +539,8 @@ int snd_soc_bytes_get(struct snd_kcontrol *kcontrol,
                       struct snd_ctl_elem_value *ucontrol);
 int snd_soc_bytes_put(struct snd_kcontrol *kcontrol,
                       struct snd_ctl_elem_value *ucontrol);
+int snd_soc_bytes_info_ext(struct snd_kcontrol *kcontrol,
+        struct snd_ctl_elem_info *ucontrol);
 int snd_soc_info_xr_sx(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_info *uinfo);
 int snd_soc_get_xr_sx(struct snd_kcontrol *kcontrol,
@@ -668,6 +669,7 @@ struct snd_soc_component {
         unsigned int active;
 
         unsigned int ignore_pmdown_time:1; /* pmdown_time is ignored at stop */
+        unsigned int registered_as_component:1;
 
         struct list_head list;
 
@@ -677,6 +679,14 @@ struct snd_soc_component {
         const struct snd_soc_component_driver *driver;
 
         struct list_head dai_list;
+
+        int (*read)(struct snd_soc_component *, unsigned int, unsigned int *);
+        int (*write)(struct snd_soc_component *, unsigned int, unsigned int);
+
+        struct regmap *regmap;
+        int val_bytes;
+
+        struct mutex io_mutex;
 };
 
 /* SoC Audio Codec device */
@@ -691,10 +701,6 @@ struct snd_soc_codec {
         struct snd_soc_card *card;
         struct list_head list;
         struct list_head card_list;
-        int num_dai;
-        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 */
@@ -704,18 +710,14 @@ struct snd_soc_codec {
         unsigned int ac97_registered:1; /* Codec has been AC97 registered */
         unsigned int ac97_created:1; /* Codec has been created by SoC */
         unsigned int cache_init:1; /* codec cache has been initialized */
-        unsigned int using_regmap:1; /* using regmap access */
         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 (*read)(struct snd_soc_codec *, unsigned int);
-        int (*write)(struct snd_soc_codec *, unsigned int, unsigned int);
         void *reg_cache;
         struct mutex cache_rw_mutex;
-        int val_bytes;
 
         /* component */
         struct snd_soc_component component;
@@ -754,13 +756,9 @@ struct snd_soc_codec_driver {
                 unsigned int freq_in, unsigned int freq_out);
 
         /* codec IO */
+        struct regmap *(*get_regmap)(struct device *);
         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)(struct snd_soc_codec *, unsigned int);
-        int (*readable_register)(struct snd_soc_codec *, unsigned int);
-        int (*writable_register)(struct snd_soc_codec *, unsigned int);
         unsigned int reg_cache_size;
         short reg_cache_step;
         short reg_word_size;
@@ -791,6 +789,7 @@ struct snd_soc_platform_driver {
         int (*remove)(struct snd_soc_platform *);
         int (*suspend)(struct snd_soc_dai *dai);
         int (*resume)(struct snd_soc_dai *dai);
+        struct snd_soc_component_driver component_driver;
 
         /* pcm creation and destruction */
         int (*pcm_new)(struct snd_soc_pcm_runtime *);
@@ -835,7 +834,6 @@ struct snd_soc_platform {
         int id;
         struct device *dev;
         const struct snd_soc_platform_driver *driver;
-        struct mutex mutex;
 
         unsigned int suspended:1; /* platform is suspended */
         unsigned int probed:1;
@@ -844,6 +842,8 @@ struct snd_soc_platform {
         struct list_head list;
         struct list_head card_list;
 
+        struct snd_soc_component component;
+
         struct snd_soc_dapm_context dapm;
 
 #ifdef CONFIG_DEBUG_FS
@@ -931,7 +931,12 @@ struct snd_soc_dai_link {
 };
 
 struct snd_soc_codec_conf {
+        /*
+         * specify device either by device name, or by
+         * DT/OF node, but not both.
+         */
         const char *dev_name;
+        const struct device_node *of_node;
 
         /*
          * optional map of kcontrol, widget and path name prefixes that are
@@ -942,7 +947,13 @@ struct snd_soc_codec_conf {
 
 struct snd_soc_aux_dev {
         const char *name;               /* Codec name */
-        const char *codec_name;         /* for multi-codec */
+
+        /*
+         * specify multi-codec either by device name, or by
+         * DT/OF node, but not both.
+         */
+        const char *codec_name;
+        const struct device_node *codec_of_node;
 
         /* codec/machine specific init - e.g. add machine controls */
         int (*init)(struct snd_soc_dapm_context *dapm);
@@ -957,7 +968,6 @@ struct snd_soc_card {
         struct snd_card *snd_card;
         struct module *owner;
 
-        struct list_head list;
         struct mutex mutex;
         struct mutex dapm_mutex;
 
@@ -1020,7 +1030,6 @@ struct snd_soc_card {
         /* 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;
@@ -1090,6 +1099,10 @@ struct soc_bytes {
         u32 mask;
 };
 
+struct soc_bytes_ext {
+        int max;
+};
+
 /* multi register control */
 struct soc_mreg_control {
         long min, max;
@@ -1120,10 +1133,39 @@ static inline struct snd_soc_codec *snd_soc_component_to_codec(
         return container_of(component, struct snd_soc_codec, component);
 }
 
+/**
+ * snd_soc_component_to_platform() - Casts a component to the platform it is embedded in
+ * @component: The component to cast to a platform
+ *
+ * This function must only be used on components that are known to be platforms.
+ * Otherwise the behavior is undefined.
+ */
+static inline struct snd_soc_platform *snd_soc_component_to_platform(
+        struct snd_soc_component *component)
+{
+        return container_of(component, struct snd_soc_platform, component);
+}
+
 /* codec IO */
 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);
+int snd_soc_write(struct snd_soc_codec *codec, unsigned int reg,
+        unsigned int val);
+
+/* component IO */
+int snd_soc_component_read(struct snd_soc_component *component,
+        unsigned int reg, unsigned int *val);
+int snd_soc_component_write(struct snd_soc_component *component,
+        unsigned int reg, unsigned int val);
+int snd_soc_component_update_bits(struct snd_soc_component *component,
+        unsigned int reg, unsigned int mask, unsigned int val);
+int snd_soc_component_update_bits_async(struct snd_soc_component *component,
+        unsigned int reg, unsigned int mask, unsigned int val);
+void snd_soc_component_async_complete(struct snd_soc_component *component);
+int snd_soc_component_test_bits(struct snd_soc_component *component,
+        unsigned int reg, unsigned int mask, unsigned int value);
+
+int snd_soc_component_init_io(struct snd_soc_component *component,
+        struct regmap *regmap);
 
 /* device driver data */
 
@@ -1173,7 +1215,6 @@ static inline void *snd_soc_pcm_get_drvdata(struct snd_soc_pcm_runtime *rtd)
 
 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);
@@ -1228,6 +1269,50 @@ static inline bool snd_soc_codec_is_active(struct snd_soc_codec *codec)
         return snd_soc_component_is_active(&codec->component);
 }
 
+/**
+ * snd_soc_kcontrol_component() - Returns the component that registered the
+ *  control
+ * @kcontrol: The control for which to get the component
+ *
+ * Note: This function will work correctly if the control has been registered
+ * for a component. Either with snd_soc_add_codec_controls() or
+ * snd_soc_add_platform_controls() or via  table based setup for either a
+ * CODEC, a platform or component driver. Otherwise the behavior is undefined.
+ */
+static inline struct snd_soc_component *snd_soc_kcontrol_component(
+        struct snd_kcontrol *kcontrol)
+{
+        return snd_kcontrol_chip(kcontrol);
+}
+
+/**
+ * snd_soc_kcontrol_codec() - Returns the CODEC that registered the control
+ * @kcontrol: The control for which to get the CODEC
+ *
+ * Note: This function will only work correctly if the control has been
+ * registered with snd_soc_add_codec_controls() or via table based setup of
+ * snd_soc_codec_driver. Otherwise the behavior is undefined.
+ */
+static inline struct snd_soc_codec *snd_soc_kcontrol_codec(
+        struct snd_kcontrol *kcontrol)
+{
+        return snd_soc_component_to_codec(snd_soc_kcontrol_component(kcontrol));
+}
+
+/**
+ * snd_soc_kcontrol_platform() - Returns the platform that registerd the control
+ * @kcontrol: The control for which to get the platform
+ *
+ * Note: This function will only work correctly if the control has been
+ * registered with snd_soc_add_platform_controls() or via table based setup of
+ * a snd_soc_platform_driver. Otherwise the behavior is undefined.
+ */
+static inline struct snd_soc_platform *snd_soc_kcontrol_platform(
+        struct snd_kcontrol *kcontrol)
+{
+        return snd_soc_component_to_platform(snd_soc_kcontrol_component(kcontrol));
+}
+
 int snd_soc_util_init(void);
 void snd_soc_util_exit(void);
 
diff --git a/include/sound/sta350.h b/include/sound/sta350.h
new file mode 100644
index 000000000000..3a3298106b22
--- /dev/null
+++ b/include/sound/sta350.h
@@ -0,0 +1,52 @@
+/*
+ * Platform data for ST STA350 ASoC codec driver.
+ *
+ * Copyright: 2014 Raumfeld GmbH
+ * Author: Sven Brandau <info@brandau.biz>
+ *
+ * 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 __LINUX_SND__STA350_H
+#define __LINUX_SND__STA350_H
+
+#define STA350_OCFG_2CH         0
+#define STA350_OCFG_2_1CH       1
+#define STA350_OCFG_1CH         3
+
+#define STA350_OM_CH1           0
+#define STA350_OM_CH2           1
+#define STA350_OM_CH3           2
+
+#define STA350_THERMAL_ADJUSTMENT_ENABLE        1
+#define STA350_THERMAL_RECOVERY_ENABLE          2
+#define STA350_FAULT_DETECT_RECOVERY_BYPASS     1
+
+#define STA350_FFX_PM_DROP_COMP                 0
+#define STA350_FFX_PM_TAPERED_COMP              1
+#define STA350_FFX_PM_FULL_POWER                2
+#define STA350_FFX_PM_VARIABLE_DROP_COMP        3
+
+
+struct sta350_platform_data {
+        u8 output_conf;
+        u8 ch1_output_mapping;
+        u8 ch2_output_mapping;
+        u8 ch3_output_mapping;
+        u8 ffx_power_output_mode;
+        u8 drop_compensation_ns;
+        unsigned int thermal_warning_recovery:1;
+        unsigned int thermal_warning_adjustment:1;
+        unsigned int fault_detect_recovery:1;
+        unsigned int oc_warning_adjustment:1;
+        unsigned int max_power_use_mpcc:1;
+        unsigned int max_power_correction:1;
+        unsigned int am_reduction_mode:1;
+        unsigned int odd_pwm_speed_mode:1;
+        unsigned int distortion_compensation:1;
+        unsigned int invalid_input_detect_mute:1;
+};
+
+#endif /* __LINUX_SND__STA350_H */