3 files changed, 29 insertions, 7 deletions

diff --git a/include/linux/platform_data/asoc-s3c.h b/include/linux/platform_data/asoc-s3c.h
index aa9875f77c40..88272591a895 100644
--- a/include/linux/platform_data/asoc-s3c.h
+++ b/include/linux/platform_data/asoc-s3c.h
@@ -38,12 +38,6 @@ struct samsung_i2s {
 #define QUIRK_NEED_RSTCLR       (1 << 3)
         /* Quirks of the I2S controller */
         u32 quirks;
-
-        /*
-         * Array of clock names that can be used to generate I2S signals.
-         * Also corresponds to clocks of I2SMOD[10]
-         */
-        const char **src_clk;
         dma_addr_t idma_addr;
 };
 
diff --git a/include/linux/platform_data/davinci_asp.h b/include/linux/platform_data/davinci_asp.h
index d0c5825876f8..8db5ae03b6e3 100644
--- a/include/linux/platform_data/davinci_asp.h
+++ b/include/linux/platform_data/davinci_asp.h
@@ -16,12 +16,13 @@
 #ifndef __DAVINCI_ASP_H
 #define __DAVINCI_ASP_H
 
+#include <linux/genalloc.h>
+
 struct snd_platform_data {
         u32 tx_dma_offset;
         u32 rx_dma_offset;
         int asp_chan_q; /* event queue number for ASP channel */
         int ram_chan_q; /* event queue number for RAM channel */
-        unsigned int codec_fmt;
         /*
          * Allowing this is more efficient and eliminates left and right swaps
          * caused by underruns, but will swap the left and right channels
@@ -30,6 +31,7 @@ struct snd_platform_data {
         unsigned enable_channel_combine:1;
         unsigned sram_size_playback;
         unsigned sram_size_capture;
+        struct gen_pool *sram_pool;
 
         /*
          * If McBSP peripheral gets the clock from an external pin,
diff --git a/include/linux/platform_data/omap-twl4030.h b/include/linux/platform_data/omap-twl4030.h
index c7bef788daab..ee60ef79d792 100644
--- a/include/linux/platform_data/omap-twl4030.h
+++ b/include/linux/platform_data/omap-twl4030.h
@@ -25,8 +25,34 @@
 #ifndef _OMAP_TWL4030_H_
 #define _OMAP_TWL4030_H_
 
+/* To select if only one channel is connected in a stereo port */
+#define OMAP_TWL4030_LEFT       (1 << 0)
+#define OMAP_TWL4030_RIGHT      (1 << 1)
+
 struct omap_tw4030_pdata {
         const char *card_name;
+        /* Voice port is connected to McBSP3 */
+        bool voice_connected;
+
+        /* The driver will parse the connection flags if this flag is set */
+        bool    custom_routing;
+        /* Flags to indicate connected audio ports. */
+        u8      has_hs;
+        u8      has_hf;
+        u8      has_predriv;
+        u8      has_carkit;
+        bool    has_ear;
+
+        bool    has_mainmic;
+        bool    has_submic;
+        bool    has_hsmic;
+        bool    has_carkitmic;
+        bool    has_digimic0;
+        bool    has_digimic1;
+        u8      has_linein;
+
+        /* Jack detect GPIO or  <= 0 if it is not implemented */
+        int jack_detect;
 };
 
 #endif /* _OMAP_TWL4030_H_ */