7 files changed, 157 insertions, 6 deletions

diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
index 9c02a4508b25..d3201e438d16 100644
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@ -591,7 +591,7 @@ struct dma_device {
         struct dma_async_tx_descriptor *(*device_prep_dma_cyclic)(
                 struct dma_chan *chan, dma_addr_t buf_addr, size_t buf_len,
                 size_t period_len, enum dma_transfer_direction direction,
-                void *context);
+                unsigned long flags, void *context);
         struct dma_async_tx_descriptor *(*device_prep_interleaved_dma)(
                 struct dma_chan *chan, struct dma_interleaved_template *xt,
                 unsigned long flags);
@@ -653,10 +653,11 @@ static inline struct dma_async_tx_descriptor *dmaengine_prep_rio_sg(
 
 static inline struct dma_async_tx_descriptor *dmaengine_prep_dma_cyclic(
                 struct dma_chan *chan, dma_addr_t buf_addr, size_t buf_len,
-                size_t period_len, enum dma_transfer_direction dir)
+                size_t period_len, enum dma_transfer_direction dir,
+                unsigned long flags)
 {
         return chan->device->device_prep_dma_cyclic(chan, buf_addr, buf_len,
-                                                period_len, dir, NULL);
+                                                period_len, dir, flags, NULL);
 }
 
 static inline int dmaengine_terminate_all(struct dma_chan *chan)
diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h
index 1faa58f9b85e..9a5e28462324 100644
--- a/include/linux/i2c/twl.h
+++ b/include/linux/i2c/twl.h
@@ -664,7 +664,7 @@ struct twl4030_codec_data {
         unsigned int check_defaults:1;
         unsigned int reset_registers:1;
         unsigned int hs_extmute:1;
-        void (*set_hs_extmute)(int mute);
+        int hs_extmute_gpio;
 };
 
 struct twl4030_vibra_data {
diff --git a/include/linux/mfd/wm8994/pdata.h b/include/linux/mfd/wm8994/pdata.h
index f0361c031927..fc87be4fdc25 100644
--- a/include/linux/mfd/wm8994/pdata.h
+++ b/include/linux/mfd/wm8994/pdata.h
@@ -164,6 +164,10 @@ struct wm8994_pdata {
         int num_micd_rates;
         struct wm8958_micd_rate *micd_rates;
 
+        /* Power up delays to add after microphone bias power up (ms) */
+        int micb1_delay;
+        int micb2_delay;
+
         /* LINEOUT can be differential or single ended */
         unsigned int lineout1_diff:1;
         unsigned int lineout2_diff:1;
diff --git a/include/linux/platform_data/asoc-mx27vis.h b/include/linux/platform_data/asoc-mx27vis.h
new file mode 100644
index 000000000000..409adcd04d04
--- /dev/null
+++ b/include/linux/platform_data/asoc-mx27vis.h
@@ -0,0 +1,11 @@
+#ifndef __PLATFORM_DATA_ASOC_MX27VIS_H
+#define __PLATFORM_DATA_ASOC_MX27VIS_H
+
+struct snd_mx27vis_platform_data {
+        int amp_gain0_gpio;
+        int amp_gain1_gpio;
+        int amp_mutel_gpio;
+        int amp_muter_gpio;
+};
+
+#endif /* __PLATFORM_DATA_ASOC_MX27VIS_H */
diff --git a/include/linux/platform_data/asoc-ti-mcbsp.h b/include/linux/platform_data/asoc-ti-mcbsp.h
index 18814127809a..c78d90b28b19 100644
--- a/include/linux/platform_data/asoc-ti-mcbsp.h
+++ b/include/linux/platform_data/asoc-ti-mcbsp.h
@@ -47,8 +47,6 @@ struct omap_mcbsp_platform_data {
         bool has_wakeup; /* Wakeup capability */
         bool has_ccr; /* Transceiver has configuration control registers */
         int (*enable_st_clock)(unsigned int, bool);
-        int (*set_clk_src)(struct device *dev, struct clk *clk, const char *src);
-        int (*mux_signal)(struct device *dev, const char *signal, const char *src);
 };
 
 /**
diff --git a/include/linux/platform_data/davinci_asp.h b/include/linux/platform_data/davinci_asp.h
new file mode 100644
index 000000000000..d0c5825876f8
--- /dev/null
+++ b/include/linux/platform_data/davinci_asp.h
@@ -0,0 +1,105 @@
+/*
+ * TI DaVinci Audio Serial Port support
+ *
+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * 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 version 2.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether express or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef __DAVINCI_ASP_H
+#define __DAVINCI_ASP_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
+         * when compared to previous behavior.
+         */
+        unsigned enable_channel_combine:1;
+        unsigned sram_size_playback;
+        unsigned sram_size_capture;
+
+        /*
+         * If McBSP peripheral gets the clock from an external pin,
+         * there are three chooses, that are MCBSP_CLKX, MCBSP_CLKR
+         * and MCBSP_CLKS.
+         * Depending on different hardware connections it is possible
+         * to use this setting to change the behaviour of McBSP
+         * driver.
+         */
+        int clk_input_pin;
+
+        /*
+         * This flag works when both clock and FS are outputs for the cpu
+         * and makes clock more accurate (FS is not symmetrical and the
+         * clock is very fast.
+         * The clock becoming faster is named
+         * i2s continuous serial clock (I2S_SCK) and it is an externally
+         * visible bit clock.
+         *
+         * first line : WordSelect
+         * second line : ContinuousSerialClock
+         * third line: SerialData
+         *
+         * SYMMETRICAL APPROACH:
+         *   _______________________          LEFT
+         * _|         RIGHT         |______________________|
+         *     _   _         _   _   _   _         _   _
+         *   _| |_| |_ x16 _| |_| |_| |_| |_ x16 _| |_| |_
+         *     _   _         _   _   _   _         _   _
+         *   _/ \_/ \_ ... _/ \_/ \_/ \_/ \_ ... _/ \_/ \_
+         *    \_/ \_/       \_/ \_/ \_/ \_/       \_/ \_/
+         *
+         * ACCURATE CLOCK APPROACH:
+         *   ______________          LEFT
+         * _|     RIGHT    |_______________________________|
+         *     _         _   _         _   _   _   _   _   _
+         *   _| |_ x16 _| |_| |_ x16 _| |_| |_| |_| |_| |_| |
+         *     _         _   _          _      dummy cycles
+         *   _/ \_ ... _/ \_/ \_  ... _/ \__________________
+         *    \_/       \_/ \_/        \_/
+         *
+         */
+        bool i2s_accurate_sck;
+
+        /* McASP specific fields */
+        int tdm_slots;
+        u8 op_mode;
+        u8 num_serializer;
+        u8 *serial_dir;
+        u8 version;
+        u8 txnumevt;
+        u8 rxnumevt;
+};
+
+enum {
+        MCASP_VERSION_1 = 0,    /* DM646x */
+        MCASP_VERSION_2,        /* DA8xx/OMAPL1x */
+        MCASP_VERSION_3,        /* TI81xx/AM33xx */
+};
+
+enum mcbsp_clk_input_pin {
+        MCBSP_CLKR = 0,         /* as in DM365 */
+        MCBSP_CLKS,
+};
+
+#define INACTIVE_MODE   0
+#define TX_MODE         1
+#define RX_MODE         2
+
+#define DAVINCI_MCASP_IIS_MODE  0
+#define DAVINCI_MCASP_DIT_MODE  1
+
+#endif
diff --git a/include/linux/platform_data/omap-twl4030.h b/include/linux/platform_data/omap-twl4030.h
new file mode 100644
index 000000000000..c7bef788daab
--- /dev/null
+++ b/include/linux/platform_data/omap-twl4030.h
@@ -0,0 +1,32 @@
+/**
+ * omap-twl4030.h - ASoC machine driver for TI SoC based boards with twl4030
+ *                  codec, header.
+ *
+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com
+ * All rights reserved.
+ *
+ * Author: Peter Ujfalusi <peter.ujfalusi@ti.com>
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+
+#ifndef _OMAP_TWL4030_H_
+#define _OMAP_TWL4030_H_
+
+struct omap_tw4030_pdata {
+        const char *card_name;
+};
+
+#endif /* _OMAP_TWL4030_H_ */