Merge remote-tracking branches 'asoc/topic/fsl-spdif', 'asoc/topic/imx', 'asoc/topic...

diff --cc sound/soc/codecs/rt5645.c
Simple merge

diff --cc sound/soc/codecs/rt5670.c
Simple merge

diff --cc sound/soc/fsl/fsl_spdif.c
Simple merge

diff --cc sound/soc/fsl/fsl_ssi.c
Simple merge

diff --cc sound/soc/intel/sst/sst_acpi.c
index e541d0e69ea285b1fb73f835d430d8650e54e45e,3abc29e8a9287d133636d97fe74a96687c953bc0,3abc29e8a9287d133636d97fe74a96687c953bc0,378ef3c3042c33220ae5d8dc91b223c135f5fbb8,3abc29e8a9287d133636d97fe74a96687c953bc0,3abc29e8a9287d133636d97fe74a96687c953bc0..b782dfdcdbba10202150257e3aa695e55ec63e24
--- 1/sound/soc/intel/sst/sst_acpi.c
--- 2/sound/soc/intel/sst/sst_acpi.c
--- 3/sound/soc/intel/sst/sst_acpi.c
--- 4/sound/soc/intel/sst/sst_acpi.c
--- 5/sound/soc/intel/sst/sst_acpi.c
--- 6/sound/soc/intel/sst/sst_acpi.c
+++ b/sound/soc/intel/sst/sst_acpi.c
@@@@@@@ -350,8 -350,8 -350,8 -350,10 -350,8 -350,8 +350,10 @@@@@@@ static struct sst_machines sst_acpi_byt
      
      /* Cherryview-based platforms: CherryTrail and Braswell */
      static struct sst_machines sst_acpi_chv[] = {
 -- --  {"10EC5670", "cht-bsw", "cht-bsw-rt5672", NULL, "fw_sst_22a8.bin",
 ++ ++  {"10EC5670", "cht-bsw", "cht-bsw-rt5672", NULL, "intel/fw_sst_22a8.bin",
 ++ ++                                          &chv_platform_data },
+++ ++  {"10EC5645", "cht-bsw", "cht-bsw-rt5645", NULL, "intel/fw_sst_22a8.bin",
+                                               &chv_platform_data },
        {},
      };