Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
0604cb3c
Commit
0604cb3c
authored
Jun 15, 2016
by
Takashi Iwai
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'for-linus' into for-next
parents
6a99ad7e
35639a0e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
1 deletion
+15
-1
sound/pci/hda/hda_intel.c
sound/pci/hda/hda_intel.c
+10
-1
sound/pci/hda/patch_realtek.c
sound/pci/hda/patch_realtek.c
+5
-0
No files found.
sound/pci/hda/hda_intel.c
View file @
0604cb3c
...
...
@@ -365,8 +365,11 @@ enum {
#define IS_SKL(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0xa170)
#define IS_SKL_LP(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x9d70)
#define IS_KBL(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0xa171)
#define IS_KBL_LP(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x9d71)
#define IS_BXT(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x5a98)
#define IS_SKL_PLUS(pci) (IS_SKL(pci) || IS_SKL_LP(pci) || IS_BXT(pci))
#define IS_SKL_PLUS(pci) (IS_SKL(pci) || IS_SKL_LP(pci) || IS_BXT(pci)) || \
IS_KBL(pci) || IS_KBL_LP(pci)
static
char
*
driver_short_names
[]
=
{
[
AZX_DRIVER_ICH
]
=
"HDA Intel"
,
...
...
@@ -2181,6 +2184,12 @@ static const struct pci_device_id azx_ids[] = {
/* Sunrise Point-LP */
{
PCI_DEVICE
(
0x8086
,
0x9d70
),
.
driver_data
=
AZX_DRIVER_PCH
|
AZX_DCAPS_INTEL_SKYLAKE
},
/* Kabylake */
{
PCI_DEVICE
(
0x8086
,
0xa171
),
.
driver_data
=
AZX_DRIVER_PCH
|
AZX_DCAPS_INTEL_SKYLAKE
},
/* Kabylake-LP */
{
PCI_DEVICE
(
0x8086
,
0x9d71
),
.
driver_data
=
AZX_DRIVER_PCH
|
AZX_DCAPS_INTEL_SKYLAKE
},
/* Broxton-P(Apollolake) */
{
PCI_DEVICE
(
0x8086
,
0x5a98
),
.
driver_data
=
AZX_DRIVER_PCH
|
AZX_DCAPS_INTEL_BROXTON
},
...
...
sound/pci/hda/patch_realtek.c
View file @
0604cb3c
...
...
@@ -5634,6 +5634,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
SND_PCI_QUIRK
(
0x17aa
,
0x2218
,
"Thinkpad X1 Carbon 2nd"
,
ALC292_FIXUP_TPT440_DOCK
),
SND_PCI_QUIRK
(
0x17aa
,
0x2223
,
"ThinkPad T550"
,
ALC292_FIXUP_TPT440_DOCK
),
SND_PCI_QUIRK
(
0x17aa
,
0x2226
,
"ThinkPad X250"
,
ALC292_FIXUP_TPT440_DOCK
),
SND_PCI_QUIRK
(
0x17aa
,
0x2231
,
"Thinkpad T560"
,
ALC292_FIXUP_TPT460
),
SND_PCI_QUIRK
(
0x17aa
,
0x2233
,
"Thinkpad"
,
ALC292_FIXUP_TPT460
),
SND_PCI_QUIRK
(
0x17aa
,
0x30bb
,
"ThinkCentre AIO"
,
ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY
),
SND_PCI_QUIRK
(
0x17aa
,
0x30e2
,
"ThinkCentre AIO"
,
ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY
),
...
...
@@ -5822,6 +5823,10 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
{
0x12
,
0x90a60180
},
{
0x14
,
0x90170130
},
{
0x21
,
0x02211040
}),
SND_HDA_PIN_QUIRK
(
0x10ec0255
,
0x1028
,
"Dell Inspiron 5565"
,
ALC255_FIXUP_DELL1_MIC_NO_PRESENCE
,
{
0x12
,
0x90a60180
},
{
0x14
,
0x90170120
},
{
0x21
,
0x02211030
}),
SND_HDA_PIN_QUIRK
(
0x10ec0256
,
0x1028
,
"Dell"
,
ALC255_FIXUP_DELL1_MIC_NO_PRESENCE
,
{
0x12
,
0x90a60160
},
{
0x14
,
0x90170120
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment