Merge branch 'asoc-5.2' into asoc-linus

2019-07-06 12:25:24 +01:00
parent 6fbc7275c7 1bcc1fd64e
commit 0dceaf7c79
16 changed files with 91 additions and 29 deletions
--- a/sound/soc/intel/skylake/skl.h
+++ b/sound/soc/intel/skylake/skl.h
@@ -37,6 +37,7 @@
 #define DMA_TRANSMITION_START	2
 #define DMA_TRANSMITION_STOP	3

+#define AZX_VS_EM2_DUM			BIT(23)
 #define AZX_REG_VS_EM2_L1SEN		BIT(13)

 struct skl_dsp_resource {