CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/codecs/twl6040.h

 /*
  * ALSA SoC TWL6040 codec driver
  *
  * Author:      Misael Lopez Cruz <x0052729@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
@@ skipping 61 matching lines @@
 #define TWL6040_THINT                   0x01
 #define TWL6040_PLUGINT                 0x02
 #define TWL6040_UNPLUGINT               0x04
 #define TWL6040_HOOKINT                 0x08
 #define TWL6040_HFINT                   0x10
 #define TWL6040_VIBINT                  0x20
 #define TWL6040_READYINT                0x40
 
 /* INTMR (0x04) fields */
 
+#define TWL6040_PLUGMSK                 0x02
 #define TWL6040_READYMSK                0x40
 #define TWL6040_ALLINT_MSK              0x7B
 
 /* NCPCTL (0x05) fields */
 
 #define TWL6040_NCPENA                  0x01
 #define TWL6040_NCPOPEN                 0x40
 
 /* LDOCTL (0x06) fields */
 
@@ skipping 36 matching lines @@
 /* ACCCTL (0x2D) fields */
 
 #define TWL6040_RESETSPLIT              0x04
 
 #define TWL6040_SYSCLK_SEL_LPPLL        1
 #define TWL6040_SYSCLK_SEL_HPPLL        2
 
 #define TWL6040_HPPLL_ID                1
 #define TWL6040_LPPLL_ID                2
 
+/* STATUS (0x2E) fields */
+
+#define TWL6040_PLUGCOMP                0x02
+
+void twl6040_hs_jack_detect(struct snd_soc_codec *codec,
+                            struct snd_soc_jack *jack, int report);
+
 #endif /* End of __TWL6040_H__ */