Merge branch 'asoc-4.21' into asoc-next

2018-12-18 12:23:59 +00:00
parent c5fd9e77be 0f4967bc21
commit a7a850dba8
188 changed files with 9580 additions and 4005 deletions
--- a/include/linux/platform_data/davinci_asp.h
+++ b/include/linux/platform_data/davinci_asp.h
@@ -79,6 +79,7 @@ struct davinci_mcasp_pdata {
 	/* McASP specific fields */
 	int tdm_slots;
 	u8 op_mode;
+	u8 dismod;
 	u8 num_serializer;
 	u8 *serial_dir;
 	u8 version;