OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
39e0a0a
38a7708
)
Merge remote-tracking branch 'asoc/topic/intel' into asoc-next
author
Mark Brown
<broonie@kernel.org>
Fri, 1 Sep 2017 11:12:19 +0000
(12:12 +0100)
committer
Mark Brown
<broonie@kernel.org>
Fri, 1 Sep 2017 11:12:19 +0000
(12:12 +0100)
1
2
sound/soc/codecs/Makefile
patch
|
diff1
|
diff2
|
blob
|
history
sound/soc/codecs/hdac_hdmi.c
patch
|
diff1
|
diff2
|
blob
|
history
sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
patch
|
diff1
|
diff2
|
blob
|
history
sound/soc/intel/skylake/skl.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
sound/soc/codecs/Makefile
Simple merge
diff --cc
sound/soc/codecs/hdac_hdmi.c
Simple merge
diff --cc
sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
Simple merge
diff --cc
sound/soc/intel/skylake/skl.c
index
6b49feb
,
d62ffbc
..
f94b484
---
1
/
sound/soc/intel/skylake/skl.c
---
2
/
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 */