From: Mark Brown <broonie@kernel.org>
Date: Fri, 1 Sep 2017 11:12:19 +0000 (+0100)
Subject: Merge remote-tracking branch 'asoc/topic/intel' into asoc-next
X-Git-Tag: v4.14-rc1~114^2~3^2~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=460f623a6e3cab02c3cda52cf64094a96afece4e;p=thirdparty%2Flinux.git

Merge remote-tracking branch 'asoc/topic/intel' into asoc-next
---

460f623a6e3cab02c3cda52cf64094a96afece4e
diff --cc sound/soc/intel/skylake/skl.c
index 6b49feb11b12f,d62ffbc93d54f..f94b484abb992
--- a/sound/soc/intel/skylake/skl.c
+++ b/sound/soc/intel/skylake/skl.c
@@@ -992,9 -994,16 +995,17 @@@ static struct sst_acpi_mach sst_glk_dev
  		.drv_name = "glk_alc298s_i2s",
  		.fw_filename = "intel/dsp_fw_glk.bin",
  	},
 +	{}
  };
  
+ static const struct sst_acpi_mach sst_cnl_devdata[] = {
+ 	{
+ 		.id = "INT34C2",
+ 		.drv_name = "cnl_rt274",
+ 		.fw_filename = "intel/dsp_fw_cnl.bin",
+ 	},
+ };
+ 
  /* PCI IDs */
  static const struct pci_device_id skl_ids[] = {
  	/* Sunrise Point-LP */