diff options
| author | Takashi Iwai | 2017-01-25 22:11:17 +0100 |
|---|---|---|
| committer | Takashi Iwai | 2017-01-25 22:11:17 +0100 |
| commit | e1a063f43a5e0435ecf8a2b6d42e10e20e8caf61 (patch) | |
| tree | 7329fb15e57917a503c859f7266fcd034728bd54 /include/sound | |
| parent | ALSA: hda/realtek - Add support headphone Mic for ALC221 of HP platform (diff) | |
| parent | ALSA: x86: hdmi: fix returnvar.cocci warnings (diff) | |
| download | kernel-qcow2-linux-e1a063f43a5e0435ecf8a2b6d42e10e20e8caf61.tar.gz kernel-qcow2-linux-e1a063f43a5e0435ecf8a2b6d42e10e20e8caf61.tar.xz kernel-qcow2-linux-e1a063f43a5e0435ecf8a2b6d42e10e20e8caf61.zip | |
Merge branch 'topic/intel-lpe-audio' into for-next
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/hdmi-codec.h | 8 | ||||
| -rw-r--r-- | include/sound/soc.h | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/include/sound/hdmi-codec.h b/include/sound/hdmi-codec.h index 530c57bdefa0..915c4357945c 100644 --- a/include/sound/hdmi-codec.h +++ b/include/sound/hdmi-codec.h @@ -36,10 +36,10 @@ struct hdmi_codec_daifmt { HDMI_AC97, HDMI_SPDIF, } fmt; - int bit_clk_inv:1; - int frame_clk_inv:1; - int bit_clk_master:1; - int frame_clk_master:1; + unsigned int bit_clk_inv:1; + unsigned int frame_clk_inv:1; + unsigned int bit_clk_master:1; + unsigned int frame_clk_master:1; }; /* diff --git a/include/sound/soc.h b/include/sound/soc.h index 2b502f6cc6d0..b86168a21d56 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -813,6 +813,7 @@ struct snd_soc_component { unsigned int suspended:1; /* is in suspend PM state */ struct list_head list; + struct list_head card_aux_list; /* for auxiliary bound components */ struct list_head card_list; struct snd_soc_dai_driver *dai_drv; @@ -1152,6 +1153,7 @@ struct snd_soc_card { */ struct snd_soc_aux_dev *aux_dev; int num_aux_devs; + struct list_head aux_comp_list; const struct snd_kcontrol_new *controls; int num_controls; @@ -1547,6 +1549,7 @@ static inline void snd_soc_initialize_card_lists(struct snd_soc_card *card) INIT_LIST_HEAD(&card->widgets); INIT_LIST_HEAD(&card->paths); INIT_LIST_HEAD(&card->dapm_list); + INIT_LIST_HEAD(&card->aux_comp_list); INIT_LIST_HEAD(&card->component_dev_list); } |