ASoC: Intel: Skylake: Add Geminlake IDs
authorVinod Koul <vinod.koul@intel.com>
Thu, 9 Feb 2017 11:14:03 +0000 (16:44 +0530)
committerMark Brown <broonie@kernel.org>
Thu, 16 Feb 2017 18:58:09 +0000 (18:58 +0000)
Geminilake is next gen SoC, so add the IDs for Geminilake.

Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/intel/skylake/skl-messages.c
sound/soc/intel/skylake/skl.c

index e79cbcf6e4629e970f00db484df9433ab9500657..e66870474f1061f2cbe14b5c1014197a033acad6 100644 (file)
@@ -220,6 +220,13 @@ static const struct skl_dsp_ops dsp_ops[] = {
                .init_fw = bxt_sst_init_fw,
                .cleanup = bxt_sst_dsp_cleanup
        },
+       {
+               .id = 0x3198,
+               .loader_ops = bxt_get_loader_ops,
+               .init = bxt_sst_dsp_init,
+               .init_fw = bxt_sst_init_fw,
+               .cleanup = bxt_sst_dsp_cleanup
+       },
 };
 
 const struct skl_dsp_ops *skl_get_dsp_ops(int pci_id)
index 1152e46daedeca45958f9d8d0fe3bd72943b1e18..0c57d4eaae3ae3bf488860f6133acdf9e7e30271 100644 (file)
@@ -883,6 +883,10 @@ static struct sst_acpi_mach sst_kbl_devdata[] = {
        {}
 };
 
+static struct sst_acpi_mach sst_glk_devdata[] = {
+       { "INT343A", "glk_alc298s_i2s", "intel/dsp_fw_glk.bin", NULL, NULL, NULL },
+};
+
 /* PCI IDs */
 static const struct pci_device_id skl_ids[] = {
        /* Sunrise Point-LP */
@@ -894,6 +898,9 @@ static const struct pci_device_id skl_ids[] = {
        /* KBL */
        { PCI_DEVICE(0x8086, 0x9D71),
                .driver_data = (unsigned long)&sst_kbl_devdata},
+       /* GLK */
+       { PCI_DEVICE(0x8086, 0x3198),
+               .driver_data = (unsigned long)&sst_glk_devdata},
        { 0, }
 };
 MODULE_DEVICE_TABLE(pci, skl_ids);