Merge remote-tracking branch 'asoc/topic/intel' into asoc-next
authorMark Brown <broonie@kernel.org>
Fri, 1 Sep 2017 11:12:19 +0000 (12:12 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 1 Sep 2017 11:12:19 +0000 (12:12 +0100)
1  2 
sound/soc/codecs/Makefile
sound/soc/codecs/hdac_hdmi.c
sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
sound/soc/intel/skylake/skl.c

Simple merge
Simple merge
index 6b49feb11b12f67a746269a1bdd24fcf7730b74e,d62ffbc93d54fa20527bfae38801ddba96295248..f94b484abb992e92c156e10f9144b1368d93d969
@@@ -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 */