1 files changed, 6 insertions, 0 deletions

diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h
index 4f4e545c0f4b..8665540e55aa 100644
--- a/sound/pci/hda/hda_codec.h
+++ b/sound/pci/hda/hda_codec.h
@@ -757,6 +757,7 @@ struct hda_pcm_stream {
         u32 rates;      /* supported rates */
         u64 formats;    /* supported formats (SNDRV_PCM_FMTBIT_) */
         unsigned int maxbps;    /* supported max. bit per sample */
+        const struct snd_pcm_chmap_elem *chmap; /* chmap to override */
         struct hda_pcm_ops ops;
 };
 
@@ -836,6 +837,7 @@ struct hda_codec {
         struct mutex hash_mutex;
         struct snd_array spdif_out;
         unsigned int spdif_in_enable;   /* SPDIF input enable? */
+        int primary_dig_out_type;       /* primary digital out PCM type */
         const hda_nid_t *slave_dig_outs; /* optional digital out slave widgets */
         struct snd_array init_pins;     /* initial (BIOS) pin configurations */
         struct snd_array driver_pins;   /* pin configs set by codec parser */
@@ -885,6 +887,8 @@ struct hda_codec {
 
         /* jack detection */
         struct snd_array jacktbl;
+        unsigned long jackpoll_interval; /* In jiffies. Zero means no poll, rely on unsol events */
+        struct delayed_work jackpoll_work;
 
 #ifdef CONFIG_SND_HDA_INPUT_JACK
         /* jack detection */
@@ -1024,6 +1028,8 @@ unsigned int snd_hda_calc_stream_format(unsigned int rate,
 int snd_hda_is_supported_format(struct hda_codec *codec, hda_nid_t nid,
                                 unsigned int format);
 
+extern const struct snd_pcm_chmap_elem snd_pcm_2_1_chmaps[];
+
 /*
  * Misc
  */