sound fixes for 4.2-rc3
There are two small fixes for HD-audio and USB LINE6, and the rest are a few new quirks and device ID addition that are good enough to get into 4.2. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAABCAAGBQJVqNr6AAoJEGwxgFQ9KSmktDUP/0af0005hx/MZ8iWZX3v7Qqj zAR5Ils2bbRz+R50WE4X2v6UERoU+DUU5qAh8XOGMAASo4xAUt9Uc/iqDWpPzcv6 4FJI7lj/8qfsqXT/moO675M1KiPJzPj9CrWQVNZldSCVOC6liGMAcvuLOIxKv8PU VBkwsVdZEa5WRwx21DOXeTnqsPWGF/sjz4i1SOFYrHjLPZspNE0lL9rX2xj0jS1Y SQgY96zIT58AqVnJNiAmyNVSTQZ915JqgBPrMWJst6xZTKMRSmmFcnLv0ep+SSsn DptdMlER8j4bC9YGxj7v1FIEeU6gkyUQ3MZ2c8AVqsrap1zTot2HWBqKQGK+3Rnr VkYxTVJ2grEZ53JPw6vI5LydqsW50Iq8lR0dFrLrVTzVzYA02pahp2uovBQ/FJ1P Lp03vt3krvSSuOW2a9pK9Y0j5KAJFvxb3YWMONJ922JJPvnur0z6w8kxJ3Y4DwwR TD0FeetGptYSh1ZvViBGUv6AfdreQV5J2eqL/bsFMxk2NoXJaiF8tb8cCoQFFl7N QZtE1yJKnv8xDjgoxYXhqwDG2+j8okRa3h7ov3MVExjh7KV7wmM+G6H7LiV1SpQ5 9SIjkgIwoMOSQGt+AubnCZdsMQZWRX8YDQS8048J6X4+SDdNKNwXASNhC5HCtfSS kGVXxyJRgEvcoBAnx96n =EgRm -----END PGP SIGNATURE----- Merge tag 'sound-4.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound Pull sound fixes from Takashi Iwai: "There are two small fixes for HD-audio and USB LINE6, and the rest are a few new quirks and device ID addition that are good enough to get into 4.2" * tag 'sound-4.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: ALSA: hda/realtek: Enable HP amp and mute LED on HP Folio 9480m [v3] ALSA: line6: Fix -EBUSY error during active monitoring ALSA: hda - Fix a wrong busy check in alt PCM open ALSA: hda - add codec ID for Broxton display audio codec ALSA: usb-audio: Add MIDI support for Steinberg MI2/MI4
This commit is contained in:
Коммит
1ea2a01c1d
|
@ -5175,7 +5175,7 @@ static int alt_playback_pcm_open(struct hda_pcm_stream *hinfo,
|
|||
int err = 0;
|
||||
|
||||
mutex_lock(&spec->pcm_mutex);
|
||||
if (!spec->indep_hp_enabled)
|
||||
if (spec->indep_hp && !spec->indep_hp_enabled)
|
||||
err = -EBUSY;
|
||||
else
|
||||
spec->active_streams |= 1 << STREAM_INDEP_HP;
|
||||
|
|
|
@ -3527,6 +3527,7 @@ static const struct hda_codec_preset snd_hda_preset_hdmi[] = {
|
|||
{ .id = 0x80862807, .name = "Haswell HDMI", .patch = patch_generic_hdmi },
|
||||
{ .id = 0x80862808, .name = "Broadwell HDMI", .patch = patch_generic_hdmi },
|
||||
{ .id = 0x80862809, .name = "Skylake HDMI", .patch = patch_generic_hdmi },
|
||||
{ .id = 0x8086280a, .name = "Broxton HDMI", .patch = patch_generic_hdmi },
|
||||
{ .id = 0x80862880, .name = "CedarTrail HDMI", .patch = patch_generic_hdmi },
|
||||
{ .id = 0x80862882, .name = "Valleyview2 HDMI", .patch = patch_generic_hdmi },
|
||||
{ .id = 0x80862883, .name = "Braswell HDMI", .patch = patch_generic_hdmi },
|
||||
|
@ -3591,6 +3592,7 @@ MODULE_ALIAS("snd-hda-codec-id:80862806");
|
|||
MODULE_ALIAS("snd-hda-codec-id:80862807");
|
||||
MODULE_ALIAS("snd-hda-codec-id:80862808");
|
||||
MODULE_ALIAS("snd-hda-codec-id:80862809");
|
||||
MODULE_ALIAS("snd-hda-codec-id:8086280a");
|
||||
MODULE_ALIAS("snd-hda-codec-id:80862880");
|
||||
MODULE_ALIAS("snd-hda-codec-id:80862882");
|
||||
MODULE_ALIAS("snd-hda-codec-id:80862883");
|
||||
|
|
|
@ -4441,6 +4441,55 @@ static void alc290_fixup_mono_speakers(struct hda_codec *codec,
|
|||
}
|
||||
}
|
||||
|
||||
/* Hook to update amp GPIO4 for automute */
|
||||
static void alc280_hp_gpio4_automute_hook(struct hda_codec *codec,
|
||||
struct hda_jack_callback *jack)
|
||||
{
|
||||
struct alc_spec *spec = codec->spec;
|
||||
|
||||
snd_hda_gen_hp_automute(codec, jack);
|
||||
/* mute_led_polarity is set to 0, so we pass inverted value here */
|
||||
alc_update_gpio_led(codec, 0x10, !spec->gen.hp_jack_present);
|
||||
}
|
||||
|
||||
/* Manage GPIOs for HP EliteBook Folio 9480m.
|
||||
*
|
||||
* GPIO4 is the headphone amplifier power control
|
||||
* GPIO3 is the audio output mute indicator LED
|
||||
*/
|
||||
|
||||
static void alc280_fixup_hp_9480m(struct hda_codec *codec,
|
||||
const struct hda_fixup *fix,
|
||||
int action)
|
||||
{
|
||||
struct alc_spec *spec = codec->spec;
|
||||
static const struct hda_verb gpio_init[] = {
|
||||
{ 0x01, AC_VERB_SET_GPIO_MASK, 0x18 },
|
||||
{ 0x01, AC_VERB_SET_GPIO_DIRECTION, 0x18 },
|
||||
{}
|
||||
};
|
||||
|
||||
if (action == HDA_FIXUP_ACT_PRE_PROBE) {
|
||||
/* Set the hooks to turn the headphone amp on/off
|
||||
* as needed
|
||||
*/
|
||||
spec->gen.vmaster_mute.hook = alc_fixup_gpio_mute_hook;
|
||||
spec->gen.hp_automute_hook = alc280_hp_gpio4_automute_hook;
|
||||
|
||||
/* The GPIOs are currently off */
|
||||
spec->gpio_led = 0;
|
||||
|
||||
/* GPIO3 is connected to the output mute LED,
|
||||
* high is on, low is off
|
||||
*/
|
||||
spec->mute_led_polarity = 0;
|
||||
spec->gpio_mute_led_mask = 0x08;
|
||||
|
||||
/* Initialize GPIO configuration */
|
||||
snd_hda_add_verbs(codec, gpio_init);
|
||||
}
|
||||
}
|
||||
|
||||
/* for hda_fixup_thinkpad_acpi() */
|
||||
#include "thinkpad_helper.c"
|
||||
|
||||
|
@ -4521,6 +4570,7 @@ enum {
|
|||
ALC286_FIXUP_HP_GPIO_LED,
|
||||
ALC280_FIXUP_HP_GPIO2_MIC_HOTKEY,
|
||||
ALC280_FIXUP_HP_DOCK_PINS,
|
||||
ALC280_FIXUP_HP_9480M,
|
||||
ALC288_FIXUP_DELL_HEADSET_MODE,
|
||||
ALC288_FIXUP_DELL1_MIC_NO_PRESENCE,
|
||||
ALC288_FIXUP_DELL_XPS_13_GPIO6,
|
||||
|
@ -5043,6 +5093,10 @@ static const struct hda_fixup alc269_fixups[] = {
|
|||
.chained = true,
|
||||
.chain_id = ALC280_FIXUP_HP_GPIO4
|
||||
},
|
||||
[ALC280_FIXUP_HP_9480M] = {
|
||||
.type = HDA_FIXUP_FUNC,
|
||||
.v.func = alc280_fixup_hp_9480m,
|
||||
},
|
||||
[ALC288_FIXUP_DELL_HEADSET_MODE] = {
|
||||
.type = HDA_FIXUP_FUNC,
|
||||
.v.func = alc_fixup_headset_mode_dell_alc288,
|
||||
|
@ -5161,6 +5215,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
|
|||
SND_PCI_QUIRK(0x103c, 0x22b7, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
|
||||
SND_PCI_QUIRK(0x103c, 0x22bf, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
|
||||
SND_PCI_QUIRK(0x103c, 0x22cf, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
|
||||
SND_PCI_QUIRK(0x103c, 0x22db, "HP", ALC280_FIXUP_HP_9480M),
|
||||
SND_PCI_QUIRK(0x103c, 0x22dc, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED),
|
||||
SND_PCI_QUIRK(0x103c, 0x22fb, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED),
|
||||
/* ALC290 */
|
||||
|
|
|
@ -186,12 +186,8 @@ static int line6_stream_start(struct snd_line6_pcm *line6pcm, int direction,
|
|||
int ret = 0;
|
||||
|
||||
spin_lock_irqsave(&pstr->lock, flags);
|
||||
if (!test_and_set_bit(type, &pstr->running)) {
|
||||
if (pstr->active_urbs || pstr->unlink_urbs) {
|
||||
ret = -EBUSY;
|
||||
goto error;
|
||||
}
|
||||
|
||||
if (!test_and_set_bit(type, &pstr->running) &&
|
||||
!(pstr->active_urbs || pstr->unlink_urbs)) {
|
||||
pstr->count = 0;
|
||||
/* Submit all currently available URBs */
|
||||
if (direction == SNDRV_PCM_STREAM_PLAYBACK)
|
||||
|
@ -199,7 +195,6 @@ static int line6_stream_start(struct snd_line6_pcm *line6pcm, int direction,
|
|||
else
|
||||
ret = line6_submit_audio_in_all_urbs(line6pcm);
|
||||
}
|
||||
error:
|
||||
if (ret < 0)
|
||||
clear_bit(type, &pstr->running);
|
||||
spin_unlock_irqrestore(&pstr->lock, flags);
|
||||
|
|
|
@ -2512,6 +2512,74 @@ YAMAHA_DEVICE(0x7010, "UB99"),
|
|||
}
|
||||
},
|
||||
|
||||
/* Steinberg devices */
|
||||
{
|
||||
/* Steinberg MI2 */
|
||||
USB_DEVICE_VENDOR_SPEC(0x0a4e, 0x2040),
|
||||
.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
|
||||
.ifnum = QUIRK_ANY_INTERFACE,
|
||||
.type = QUIRK_COMPOSITE,
|
||||
.data = & (const struct snd_usb_audio_quirk[]) {
|
||||
{
|
||||
.ifnum = 0,
|
||||
.type = QUIRK_AUDIO_STANDARD_INTERFACE
|
||||
},
|
||||
{
|
||||
.ifnum = 1,
|
||||
.type = QUIRK_AUDIO_STANDARD_INTERFACE
|
||||
},
|
||||
{
|
||||
.ifnum = 2,
|
||||
.type = QUIRK_AUDIO_STANDARD_INTERFACE
|
||||
},
|
||||
{
|
||||
.ifnum = 3,
|
||||
.type = QUIRK_MIDI_FIXED_ENDPOINT,
|
||||
.data = &(const struct snd_usb_midi_endpoint_info) {
|
||||
.out_cables = 0x0001,
|
||||
.in_cables = 0x0001
|
||||
}
|
||||
},
|
||||
{
|
||||
.ifnum = -1
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
/* Steinberg MI4 */
|
||||
USB_DEVICE_VENDOR_SPEC(0x0a4e, 0x4040),
|
||||
.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
|
||||
.ifnum = QUIRK_ANY_INTERFACE,
|
||||
.type = QUIRK_COMPOSITE,
|
||||
.data = & (const struct snd_usb_audio_quirk[]) {
|
||||
{
|
||||
.ifnum = 0,
|
||||
.type = QUIRK_AUDIO_STANDARD_INTERFACE
|
||||
},
|
||||
{
|
||||
.ifnum = 1,
|
||||
.type = QUIRK_AUDIO_STANDARD_INTERFACE
|
||||
},
|
||||
{
|
||||
.ifnum = 2,
|
||||
.type = QUIRK_AUDIO_STANDARD_INTERFACE
|
||||
},
|
||||
{
|
||||
.ifnum = 3,
|
||||
.type = QUIRK_MIDI_FIXED_ENDPOINT,
|
||||
.data = &(const struct snd_usb_midi_endpoint_info) {
|
||||
.out_cables = 0x0001,
|
||||
.in_cables = 0x0001
|
||||
}
|
||||
},
|
||||
{
|
||||
.ifnum = -1
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
/* TerraTec devices */
|
||||
{
|
||||
USB_DEVICE_VENDOR_SPEC(0x0ccd, 0x0012),
|
||||
|
|
Загрузка…
Ссылка в новой задаче