Merge remote-tracking branch 'asoc/topic/omap' into asoc-next

1 files changed, 26 insertions, 0 deletions

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_ */