diff options
| author | Mark Brown <broonie@kernel.org> | 2016-01-05 19:06:29 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-01-05 19:06:29 +0100 |
| commit | ee1e4e3f0d50aebdc6dac2a2cd4ae203ed2a75c1 (patch) | |
| tree | 3ae1d5d33402f3459a65fe492c97d75c168bb04c /include/sound | |
| parent | ASoC: Intel: Atom: Add support for HP ElitePad 1000 G2 (diff) | |
| parent | ASoC: Intel: Skylake: Fix the memory leak (diff) | |
| download | linux-ee1e4e3f0d50aebdc6dac2a2cd4ae203ed2a75c1.tar.xz linux-ee1e4e3f0d50aebdc6dac2a2cd4ae203ed2a75c1.zip | |
Merge branch 'fix/intel' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-intel
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/hda_register.h | 3 | ||||
| -rw-r--r-- | include/sound/soc-dapm.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/sound/hda_register.h b/include/sound/hda_register.h index 2ae8812d7b1a..94dc6a9772e0 100644 --- a/include/sound/hda_register.h +++ b/include/sound/hda_register.h @@ -93,6 +93,9 @@ enum { SDI0, SDI1, SDI2, SDI3, SDO0, SDO1, SDO2, SDO3 }; #define AZX_REG_HSW_EM4 0x100c #define AZX_REG_HSW_EM5 0x1010 +/* Skylake/Broxton display HD-A controller Extended Mode registers */ +#define AZX_REG_SKL_EM4L 0x1040 + /* PCI space */ #define AZX_PCIREG_TCSEL 0x44 diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index fe19dd3abb00..97069466c38d 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h @@ -401,6 +401,7 @@ int snd_soc_dapm_del_routes(struct snd_soc_dapm_context *dapm, int snd_soc_dapm_weak_routes(struct snd_soc_dapm_context *dapm, const struct snd_soc_dapm_route *route, int num); void snd_soc_dapm_free_widget(struct snd_soc_dapm_widget *w); +void snd_soc_dapm_reset_cache(struct snd_soc_dapm_context *dapm); /* dapm events */ void snd_soc_dapm_stream_event(struct snd_soc_pcm_runtime *rtd, int stream, |