From: Mark Brown <broonie@kernel.org>
Date: Mon, 9 Feb 2015 07:10:19 +0000 (+0800)
Subject: Merge remote-tracking branches 'asoc/topic/fsl-spdif', 'asoc/topic/imx', 'asoc/topic... 
X-Git-Tag: Ubuntu-5.13.0-19.19~18546^2~13^2~6
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=6e685ea6aaa3c578596ff8dbe6efde9485fc68f9;p=mirror_ubuntu-jammy-kernel.git

Merge remote-tracking branches 'asoc/topic/fsl-spdif', 'asoc/topic/imx', 'asoc/topic/intel', 'asoc/topic/jz4740' and 'asoc/topic/max98357a' into asoc-next
---

6e685ea6aaa3c578596ff8dbe6efde9485fc68f9
diff --cc sound/soc/intel/sst/sst_acpi.c
index e541d0e69ea2,3abc29e8a928,3abc29e8a928,378ef3c3042c,3abc29e8a928,3abc29e8a928..b782dfdcdbba
--- a/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 },
      	{},
      };