Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'sound-4.0' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai:
"Here are fixes gathered for 4.0-final; one FireFire endian fix, two
USB-audio quirks, and three HD-audio quirks.
All relatively small and device-specific fixes, should be pretty safe
to apply"
* tag 'sound-4.0' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: usb - Creative USB X-Fi Pro SB1095 volume knob support
ALSA: hda - Fix headphone pin config for Lifebook T731
ALSA: bebob: fix to processing in big-endian machine for sending cue
ALSA: hda/realtek - Make more stable to get pin sense for ALC283
ALSA: usb-audio: don't try to get Benchmark DAC1 sample rate
ALSA: hda/realtek - Support Dell headset mode for ALC256
+39
-6
+4
-4
sound/firewire/bebob/bebob_maudio.c
+4
-4
sound/firewire/bebob/bebob_maudio.c
···
96
96
struct fw_device *device = fw_parent_device(unit);
97
97
int err, rcode;
98
98
u64 date;
99
-
__be32 cues[3] = {
100
-
MAUDIO_BOOTLOADER_CUE1,
101
-
MAUDIO_BOOTLOADER_CUE2,
102
-
MAUDIO_BOOTLOADER_CUE3
99
+
__le32 cues[3] = {
100
+
cpu_to_le32(MAUDIO_BOOTLOADER_CUE1),
101
+
cpu_to_le32(MAUDIO_BOOTLOADER_CUE2),
102
+
cpu_to_le32(MAUDIO_BOOTLOADER_CUE3)
103
103
};
104
104
105
105
/* check date of software used to build */
+27
sound/pci/hda/patch_realtek.c
+27
sound/pci/hda/patch_realtek.c
···
2912
2912
2913
2913
if (!hp_pin)
2914
2914
return;
2915
+
2916
+
msleep(30);
2915
2917
hp_pin_sense = snd_hda_jack_detect(codec, hp_pin);
2916
2918
2917
2919
/* Index 0x43 Direct Drive HP AMP LPM Control 1 */
···
3609
3607
3610
3608
switch (codec->vendor_id) {
3611
3609
case 0x10ec0255:
3610
+
case 0x10ec0256:
3612
3611
alc_process_coef_fw(codec, coef0255);
3613
3612
break;
3614
3613
case 0x10ec0233:
···
3665
3662
3666
3663
switch (codec->vendor_id) {
3667
3664
case 0x10ec0255:
3665
+
case 0x10ec0256:
3668
3666
alc_write_coef_idx(codec, 0x45, 0xc489);
3669
3667
snd_hda_set_pin_ctl_cache(codec, hp_pin, 0);
3670
3668
alc_process_coef_fw(codec, coef0255);
···
3735
3731
3736
3732
switch (codec->vendor_id) {
3737
3733
case 0x10ec0255:
3734
+
case 0x10ec0256:
3738
3735
alc_process_coef_fw(codec, coef0255);
3739
3736
break;
3740
3737
case 0x10ec0233:
···
3790
3785
3791
3786
switch (codec->vendor_id) {
3792
3787
case 0x10ec0255:
3788
+
case 0x10ec0256:
3793
3789
alc_process_coef_fw(codec, coef0255);
3794
3790
break;
3795
3791
case 0x10ec0233:
···
3845
3839
3846
3840
switch (codec->vendor_id) {
3847
3841
case 0x10ec0255:
3842
+
case 0x10ec0256:
3848
3843
alc_process_coef_fw(codec, coef0255);
3849
3844
break;
3850
3845
case 0x10ec0233:
···
3891
3884
3892
3885
switch (codec->vendor_id) {
3893
3886
case 0x10ec0255:
3887
+
case 0x10ec0256:
3894
3888
alc_process_coef_fw(codec, coef0255);
3895
3889
msleep(300);
3896
3890
val = alc_read_coef_idx(codec, 0x46);
···
4372
4364
ALC269_FIXUP_QUANTA_MUTE,
4373
4365
ALC269_FIXUP_LIFEBOOK,
4374
4366
ALC269_FIXUP_LIFEBOOK_EXTMIC,
4367
+
ALC269_FIXUP_LIFEBOOK_HP_PIN,
4375
4368
ALC269_FIXUP_AMIC,
4376
4369
ALC269_FIXUP_DMIC,
4377
4370
ALC269VB_FIXUP_AMIC,
···
4523
4514
.type = HDA_FIXUP_PINS,
4524
4515
.v.pins = (const struct hda_pintbl[]) {
4525
4516
{ 0x19, 0x01a1903c }, /* headset mic, with jack detect */
4517
+
{ }
4518
+
},
4519
+
},
4520
+
[ALC269_FIXUP_LIFEBOOK_HP_PIN] = {
4521
+
.type = HDA_FIXUP_PINS,
4522
+
.v.pins = (const struct hda_pintbl[]) {
4523
+
{ 0x21, 0x0221102f }, /* HP out */
4526
4524
{ }
4527
4525
},
4528
4526
},
···
5026
5010
SND_PCI_QUIRK(0x104d, 0x9084, "Sony VAIO", ALC275_FIXUP_SONY_HWEQ),
5027
5011
SND_PCI_QUIRK(0x104d, 0x9099, "Sony VAIO S13", ALC275_FIXUP_SONY_DISABLE_AAMIX),
5028
5012
SND_PCI_QUIRK(0x10cf, 0x1475, "Lifebook", ALC269_FIXUP_LIFEBOOK),
5013
+
SND_PCI_QUIRK(0x10cf, 0x15dc, "Lifebook T731", ALC269_FIXUP_LIFEBOOK_HP_PIN),
5029
5014
SND_PCI_QUIRK(0x10cf, 0x1845, "Lifebook U904", ALC269_FIXUP_LIFEBOOK_EXTMIC),
5030
5015
SND_PCI_QUIRK(0x144d, 0xc109, "Samsung Ativ book 9 (NP900X3G)", ALC269_FIXUP_INV_DMIC),
5031
5016
SND_PCI_QUIRK(0x1458, 0xfa53, "Gigabyte BXBT-2807", ALC283_FIXUP_BXBT2807_MIC),
···
5234
5217
{0x17, 0x40000000},
5235
5218
{0x1d, 0x40700001},
5236
5219
{0x21, 0x02211050}),
5220
+
SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
5221
+
{0x12, 0x90a60140},
5222
+
{0x13, 0x40000000},
5223
+
{0x14, 0x90170110},
5224
+
{0x19, 0x411111f0},
5225
+
{0x1a, 0x411111f0},
5226
+
{0x1b, 0x411111f0},
5227
+
{0x1d, 0x40700001},
5228
+
{0x1e, 0x411111f0},
5229
+
{0x21, 0x02211020}),
5237
5230
SND_HDA_PIN_QUIRK(0x10ec0280, 0x103c, "HP", ALC280_FIXUP_HP_GPIO4,
5238
5231
{0x12, 0x90a60130},
5239
5232
{0x13, 0x40000000},
+1
sound/usb/mixer_quirks.c
+1
sound/usb/mixer_quirks.c
···
192
192
{ USB_ID(0x041e, 0x3040), 2, 2, 6, 6, 2, 0x6e91 }, /* Live! 24-bit */
193
193
{ USB_ID(0x041e, 0x3042), 0, 1, 1, 1, 1, 0x000d }, /* Usb X-Fi S51 */
194
194
{ USB_ID(0x041e, 0x30df), 0, 1, 1, 1, 1, 0x000d }, /* Usb X-Fi S51 Pro */
195
+
{ USB_ID(0x041e, 0x3237), 0, 1, 1, 1, 1, 0x000d }, /* Usb X-Fi S51 Pro */
195
196
{ USB_ID(0x041e, 0x3048), 2, 2, 6, 6, 2, 0x6e91 }, /* Toshiba SB0500 */
196
197
};
197
198
+7
-2
sound/usb/quirks.c
+7
-2
sound/usb/quirks.c
···
1113
1113
1114
1114
bool snd_usb_get_sample_rate_quirk(struct snd_usb_audio *chip)
1115
1115
{
1116
-
/* MS Lifecam HD-5000 doesn't support reading the sample rate. */
1117
-
return chip->usb_id == USB_ID(0x045E, 0x076D);
1116
+
/* devices which do not support reading the sample rate. */
1117
+
switch (chip->usb_id) {
1118
+
case USB_ID(0x045E, 0x076D): /* MS Lifecam HD-5000 */
1119
+
case USB_ID(0x04D8, 0xFEEA): /* Benchmark DAC1 Pre */
1120
+
return true;
1121
+
}
1122
+
return false;
1118
1123
}
1119
1124
1120
1125
/* Marantz/Denon USB DACs need a vendor cmd to switch