aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/intel
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2016-07-11 12:32:08 -0400
committerMark Brown <broonie@kernel.org>2016-07-11 17:20:15 -0400
commit451dfb5f82c7ed5f691be5f6409637e03d5f9c65 (patch)
tree93276413f080b181d246e80f311995477c4172ad /sound/soc/intel
parenta395bdd6b24b692adbce0df6510ec9f2af57573e (diff)
ASoC: Intel: add kablake device IDs
Kabylake is next generation Intel platform which has similar audio controller to Skylake, so add the ID and driver data in SKL driver. Signed-off-by: Vinod Koul <vinod.koul@intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel')
-rw-r--r--sound/soc/intel/skylake/skl-messages.c6
-rw-r--r--sound/soc/intel/skylake/skl.c8
2 files changed, 14 insertions, 0 deletions
diff --git a/sound/soc/intel/skylake/skl-messages.c b/sound/soc/intel/skylake/skl-messages.c
index 6902020df946..44ab595ce21a 100644
--- a/sound/soc/intel/skylake/skl-messages.c
+++ b/sound/soc/intel/skylake/skl-messages.c
@@ -206,6 +206,12 @@ static const struct skl_dsp_ops dsp_ops[] = {
206 .cleanup = skl_sst_dsp_cleanup 206 .cleanup = skl_sst_dsp_cleanup
207 }, 207 },
208 { 208 {
209 .id = 0x9d71,
210 .loader_ops = skl_get_loader_ops,
211 .init = skl_sst_dsp_init,
212 .cleanup = skl_sst_dsp_cleanup
213 },
214 {
209 .id = 0x5a98, 215 .id = 0x5a98,
210 .loader_ops = bxt_get_loader_ops, 216 .loader_ops = bxt_get_loader_ops,
211 .init = bxt_sst_dsp_init, 217 .init = bxt_sst_dsp_init,
diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c
index d5d7c53e07bc..4e30effc5469 100644
--- a/sound/soc/intel/skylake/skl.c
+++ b/sound/soc/intel/skylake/skl.c
@@ -813,6 +813,11 @@ static struct sst_acpi_mach sst_bxtp_devdata[] = {
813 { "DLGS7219", "bxt_da7219_max98357a_i2s", "intel/dsp_fw_bxtn.bin", NULL, NULL, NULL }, 813 { "DLGS7219", "bxt_da7219_max98357a_i2s", "intel/dsp_fw_bxtn.bin", NULL, NULL, NULL },
814}; 814};
815 815
816static struct sst_acpi_mach sst_kbl_devdata[] = {
817 { "INT343A", "kbl_alc286s_i2s", "intel/dsp_fw_kbl.bin", NULL, NULL, NULL },
818 {}
819};
820
816/* PCI IDs */ 821/* PCI IDs */
817static const struct pci_device_id skl_ids[] = { 822static const struct pci_device_id skl_ids[] = {
818 /* Sunrise Point-LP */ 823 /* Sunrise Point-LP */
@@ -821,6 +826,9 @@ static const struct pci_device_id skl_ids[] = {
821 /* BXT-P */ 826 /* BXT-P */
822 { PCI_DEVICE(0x8086, 0x5a98), 827 { PCI_DEVICE(0x8086, 0x5a98),
823 .driver_data = (unsigned long)&sst_bxtp_devdata}, 828 .driver_data = (unsigned long)&sst_bxtp_devdata},
829 /* KBL */
830 { PCI_DEVICE(0x8086, 0x9D71),
831 .driver_data = (unsigned long)&sst_kbl_devdata},
824 { 0, } 832 { 0, }
825}; 833};
826MODULE_DEVICE_TABLE(pci, skl_ids); 834MODULE_DEVICE_TABLE(pci, skl_ids);