Merge remote-tracking branches 'asoc/topic/adsp' and 'asoc/topic/amd' into asoc-next

2016-01-11 13:54:32 +00:00
parent 551e13a4b9 83a40ce993 7cb1dc8109
commit 188bdf7268
14 changed files with 5503 additions and 0 deletions
--- a/include/sound/designware_i2s.h
+++ b/include/sound/designware_i2s.h
@@ -46,6 +46,7 @@ struct i2s_platform_data {
 	u32 snd_rates;

 	#define DW_I2S_QUIRK_COMP_REG_OFFSET	(1 << 0)
+	#define DW_I2S_QUIRK_COMP_PARAM1	(1 << 1)
 	unsigned int quirks;
 	unsigned int i2s_reg_comp1;
 	unsigned int i2s_reg_comp2;