Skip to content

L
linux
Commit 5c94bdab authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge tag 'sound-6.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "A collection of small fixes, nothing really stands out:

   - Usual HD-audio quirks / device-specific fixes

   - Kconfig dependency fix for UM

   - A series of minor fixes for SoundWire

   - Updates of USB-audio LINE6 contact address"

* tag 'sound-6.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda/conexant - Use cached pin control for Node 0x1d on HP EliteOne 1000 G2
  ALSA/hda: intel-sdw-acpi: add support for sdw-manager-list property read
  ALSA/hda: intel-sdw-acpi: simplify sdw-master-count property read
  ALSA/hda: intel-sdw-acpi: fetch fwnode once in sdw_intel_scan_controller()
  ALSA/hda: intel-sdw-acpi: cleanup sdw_intel_scan_controller
  ALSA: hda/tas2781: Add new quirk for Lenovo, ASUS, Dell projects
  ALSA: scarlett2: Add error check after retrieving PEQ filter values
  ALSA: hda/cs8409: Fix possible NULL dereference
  sound: Make CONFIG_SND depend on INDIRECT_IOMEM instead of UML
  ALSA: line6: update contact information
  ALSA: usb-audio: Fix NULL pointer deref in snd_usb_power_domain_set()
  ALSA: hda/conexant - Fix audio routing for HP EliteOne 1000 G2
  ALSA: hda: Sound support for HP Spectre x360 16 inch model 2024
parents 07d6bf63 164cd0e0
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 143 additions and 32 deletions
include/linux/soundwire/sdw_intel.h
View file @ 5c94bdab
...@@ -227,7 +227,7 @@ struct sdw_intel_ops { ...@@ -227,7 +227,7 @@ struct sdw_intel_ops {
/** /**
* struct sdw_intel_acpi_info - Soundwire Intel information found in ACPI tables * struct sdw_intel_acpi_info - Soundwire Intel information found in ACPI tables
* @handle: ACPI controller handle * @handle: ACPI controller handle
* @count: link count found with "sdw-master-count" property * @count: link count found with "sdw-master-count" or "sdw-manager-list" property
* @link_mask: bit-wise mask listing links enabled by BIOS menu * @link_mask: bit-wise mask listing links enabled by BIOS menu
* *
* this structure could be expanded to e.g. provide all the _ADR * this structure could be expanded to e.g. provide all the _ADR
......
sound/Kconfig
View file @ 5c94bdab
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
menuconfig SOUND menuconfig SOUND
tristate "Sound card support" tristate "Sound card support"
depends on HAS_IOMEM || UML depends on HAS_IOMEM || INDIRECT_IOMEM
help help
If you have a sound card in your computer, i.e. if it can say more If you have a sound card in your computer, i.e. if it can say more
than an occasional beep, say Y. than an occasional beep, say Y.
......
sound/hda/intel-sdw-acpi.c
View file @ 5c94bdab
...@@ -56,18 +56,21 @@ static int ...@@ -56,18 +56,21 @@ static int
sdw_intel_scan_controller(struct sdw_intel_acpi_info *info) sdw_intel_scan_controller(struct sdw_intel_acpi_info *info)
{ {
struct acpi_device *adev = acpi_fetch_acpi_dev(info->handle); struct acpi_device *adev = acpi_fetch_acpi_dev(info->handle);
u8 count, i; struct fwnode_handle *fwnode;
unsigned long list;
unsigned int i;
u32 count;
u32 tmp;
int ret; int ret;
if (!adev) if (!adev)
return -EINVAL; return -EINVAL;
/* Found controller, find links supported */ fwnode = acpi_fwnode_handle(adev);
count = 0;
ret = fwnode_property_read_u8_array(acpi_fwnode_handle(adev),
"mipi-sdw-master-count", &count, 1);
/* /*
* Found controller, find links supported
*
* In theory we could check the number of links supported in * In theory we could check the number of links supported in
* hardware, but in that step we cannot assume SoundWire IP is * hardware, but in that step we cannot assume SoundWire IP is
* powered. * powered.
...@@ -78,11 +81,19 @@ sdw_intel_scan_controller(struct sdw_intel_acpi_info *info) ...@@ -78,11 +81,19 @@ sdw_intel_scan_controller(struct sdw_intel_acpi_info *info)
* *
* We will check the hardware capabilities in the startup() step * We will check the hardware capabilities in the startup() step
*/ */
ret = fwnode_property_read_u32(fwnode, "mipi-sdw-manager-list", &tmp);
if (ret) { if (ret) {
dev_err(&adev->dev, ret = fwnode_property_read_u32(fwnode, "mipi-sdw-master-count", &count);
"Failed to read mipi-sdw-master-count: %d\n", ret); if (ret) {
return -EINVAL; dev_err(&adev->dev,
"Failed to read mipi-sdw-master-count: %d\n",
ret);
return ret;
}
list = GENMASK(count - 1, 0);
} else {
list = tmp;
count = hweight32(list);
} }
/* Check count is within bounds */ /* Check count is within bounds */
...@@ -101,14 +112,14 @@ sdw_intel_scan_controller(struct sdw_intel_acpi_info *info) ...@@ -101,14 +112,14 @@ sdw_intel_scan_controller(struct sdw_intel_acpi_info *info)
info->count = count; info->count = count;
info->link_mask = 0; info->link_mask = 0;
for (i = 0; i < count; i++) { for_each_set_bit(i, &list, SDW_INTEL_MAX_LINKS) {
if (ctrl_link_mask && !(ctrl_link_mask & BIT(i))) { if (ctrl_link_mask && !(ctrl_link_mask & BIT(i))) {
dev_dbg(&adev->dev, dev_dbg(&adev->dev,
"Link %d masked, will not be enabled\n", i); "Link %d masked, will not be enabled\n", i);
continue; continue;
} }
if (!is_link_enabled(acpi_fwnode_handle(adev), i)) { if (!is_link_enabled(fwnode, i)) {
dev_dbg(&adev->dev, dev_dbg(&adev->dev,
"Link %d not selected in firmware\n", i); "Link %d not selected in firmware\n", i);
continue; continue;
......
sound/pci/hda/patch_conexant.c
View file @ 5c94bdab
...@@ -303,6 +303,7 @@ enum { ...@@ -303,6 +303,7 @@ enum {
CXT_FIXUP_HP_SPECTRE, CXT_FIXUP_HP_SPECTRE,
CXT_FIXUP_HP_GATE_MIC, CXT_FIXUP_HP_GATE_MIC,
CXT_FIXUP_MUTE_LED_GPIO, CXT_FIXUP_MUTE_LED_GPIO,
CXT_FIXUP_HP_ELITEONE_OUT_DIS,
CXT_FIXUP_HP_ZBOOK_MUTE_LED, CXT_FIXUP_HP_ZBOOK_MUTE_LED,
CXT_FIXUP_HEADSET_MIC, CXT_FIXUP_HEADSET_MIC,
CXT_FIXUP_HP_MIC_NO_PRESENCE, CXT_FIXUP_HP_MIC_NO_PRESENCE,
...@@ -320,6 +321,19 @@ static void cxt_fixup_stereo_dmic(struct hda_codec *codec, ...@@ -320,6 +321,19 @@ static void cxt_fixup_stereo_dmic(struct hda_codec *codec,
spec->gen.inv_dmic_split = 1; spec->gen.inv_dmic_split = 1;
} }
/* fix widget control pin settings */
static void cxt_fixup_update_pinctl(struct hda_codec *codec,
const struct hda_fixup *fix, int action)
{
if (action == HDA_FIXUP_ACT_PROBE) {
/* Unset OUT_EN for this Node pin, leaving only HP_EN.
* This is the value stored in the codec register after
* the correct initialization of the previous windows boot.
*/
snd_hda_set_pin_ctl_cache(codec, 0x1d, AC_PINCTL_HP_EN);
}
}
static void cxt5066_increase_mic_boost(struct hda_codec *codec, static void cxt5066_increase_mic_boost(struct hda_codec *codec,
const struct hda_fixup *fix, int action) const struct hda_fixup *fix, int action)
{ {
...@@ -971,6 +985,10 @@ static const struct hda_fixup cxt_fixups[] = { ...@@ -971,6 +985,10 @@ static const struct hda_fixup cxt_fixups[] = {
.type = HDA_FIXUP_FUNC, .type = HDA_FIXUP_FUNC,
.v.func = cxt_fixup_mute_led_gpio, .v.func = cxt_fixup_mute_led_gpio,
}, },
[CXT_FIXUP_HP_ELITEONE_OUT_DIS] = {
.type = HDA_FIXUP_FUNC,
.v.func = cxt_fixup_update_pinctl,
},
[CXT_FIXUP_HP_ZBOOK_MUTE_LED] = { [CXT_FIXUP_HP_ZBOOK_MUTE_LED] = {
.type = HDA_FIXUP_FUNC, .type = HDA_FIXUP_FUNC,
.v.func = cxt_fixup_hp_zbook_mute_led, .v.func = cxt_fixup_hp_zbook_mute_led,
...@@ -1061,6 +1079,7 @@ static const struct snd_pci_quirk cxt5066_fixups[] = { ...@@ -1061,6 +1079,7 @@ static const struct snd_pci_quirk cxt5066_fixups[] = {
SND_PCI_QUIRK(0x103c, 0x83b2, "HP EliteBook 840 G5", CXT_FIXUP_HP_DOCK), SND_PCI_QUIRK(0x103c, 0x83b2, "HP EliteBook 840 G5", CXT_FIXUP_HP_DOCK),
SND_PCI_QUIRK(0x103c, 0x83b3, "HP EliteBook 830 G5", CXT_FIXUP_HP_DOCK), SND_PCI_QUIRK(0x103c, 0x83b3, "HP EliteBook 830 G5", CXT_FIXUP_HP_DOCK),
SND_PCI_QUIRK(0x103c, 0x83d3, "HP ProBook 640 G4", CXT_FIXUP_HP_DOCK), SND_PCI_QUIRK(0x103c, 0x83d3, "HP ProBook 640 G4", CXT_FIXUP_HP_DOCK),
SND_PCI_QUIRK(0x103c, 0x83e5, "HP EliteOne 1000 G2", CXT_FIXUP_HP_ELITEONE_OUT_DIS),
SND_PCI_QUIRK(0x103c, 0x8402, "HP ProBook 645 G4", CXT_FIXUP_MUTE_LED_GPIO), SND_PCI_QUIRK(0x103c, 0x8402, "HP ProBook 645 G4", CXT_FIXUP_MUTE_LED_GPIO),
SND_PCI_QUIRK(0x103c, 0x8427, "HP ZBook Studio G5", CXT_FIXUP_HP_ZBOOK_MUTE_LED), SND_PCI_QUIRK(0x103c, 0x8427, "HP ZBook Studio G5", CXT_FIXUP_HP_ZBOOK_MUTE_LED),
SND_PCI_QUIRK(0x103c, 0x844f, "HP ZBook Studio G5", CXT_FIXUP_HP_ZBOOK_MUTE_LED), SND_PCI_QUIRK(0x103c, 0x844f, "HP ZBook Studio G5", CXT_FIXUP_HP_ZBOOK_MUTE_LED),
......
sound/pci/hda/patch_cs8409.c
View file @ 5c94bdab
...@@ -1403,8 +1403,9 @@ void dolphin_fixups(struct hda_codec *codec, const struct hda_fixup *fix, int ac ...@@ -1403,8 +1403,9 @@ void dolphin_fixups(struct hda_codec *codec, const struct hda_fixup *fix, int ac
kctrl = snd_hda_gen_add_kctl(&spec->gen, "Line Out Playback Volume", kctrl = snd_hda_gen_add_kctl(&spec->gen, "Line Out Playback Volume",
&cs42l42_dac_volume_mixer); &cs42l42_dac_volume_mixer);
/* Update Line Out kcontrol template */ /* Update Line Out kcontrol template */
kctrl->private_value = HDA_COMPOSE_AMP_VAL_OFS(DOLPHIN_HP_PIN_NID, 3, CS8409_CODEC1, if (kctrl)
HDA_OUTPUT, CS42L42_VOL_DAC) | HDA_AMP_VAL_MIN_MUTE; kctrl->private_value = HDA_COMPOSE_AMP_VAL_OFS(DOLPHIN_HP_PIN_NID, 3, CS8409_CODEC1,
HDA_OUTPUT, CS42L42_VOL_DAC) | HDA_AMP_VAL_MIN_MUTE;
cs8409_enable_ur(codec, 0); cs8409_enable_ur(codec, 0);
snd_hda_codec_set_name(codec, "CS8409/CS42L42"); snd_hda_codec_set_name(codec, "CS8409/CS42L42");
break; break;
......
sound/pci/hda/patch_realtek.c
View file @ 5c94bdab
This diff is collapsed.
sound/usb/line6/capture.c
View file @ 5c94bdab
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/* /*
* Line 6 Linux USB driver * Line 6 Linux USB driver
* *
* Copyright (C) 2004-2010 Markus Grabner (grabner@icg.tugraz.at) * Copyright (C) 2004-2010 Markus Grabner (line6@grabner-graz.at)
*/ */
#include <linux/slab.h> #include <linux/slab.h>
......
sound/usb/line6/capture.h
View file @ 5c94bdab
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/* /*
* Line 6 Linux USB driver * Line 6 Linux USB driver
* *
* Copyright (C) 2004-2010 Markus Grabner (grabner@icg.tugraz.at) * Copyright (C) 2004-2010 Markus Grabner (line6@grabner-graz.at)
*/ */
#ifndef CAPTURE_H #ifndef CAPTURE_H
......
sound/usb/line6/driver.c
View file @ 5c94bdab
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/* /*
* Line 6 Linux USB driver * Line 6 Linux USB driver
* *
* Copyright (C) 2004-2010 Markus Grabner (grabner@icg.tugraz.at) * Copyright (C) 2004-2010 Markus Grabner (line6@grabner-graz.at)
*/ */
#include <linux/kernel.h> #include <linux/kernel.h>
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "midi.h" #include "midi.h"
#include "playback.h" #include "playback.h"
#define DRIVER_AUTHOR "Markus Grabner <grabner@icg.tugraz.at>" #define DRIVER_AUTHOR "Markus Grabner <line6@grabner-graz.at>"
#define DRIVER_DESC "Line 6 USB Driver" #define DRIVER_DESC "Line 6 USB Driver"
/* /*
......
sound/usb/line6/driver.h
View file @ 5c94bdab
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/* /*
* Line 6 Linux USB driver * Line 6 Linux USB driver
* *
* Copyright (C) 2004-2010 Markus Grabner (grabner@icg.tugraz.at) * Copyright (C) 2004-2010 Markus Grabner (line6@grabner-graz.at)
*/ */
#ifndef DRIVER_H #ifndef DRIVER_H
......
sound/usb/line6/midi.c
View file @ 5c94bdab
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/* /*
* Line 6 Linux USB driver * Line 6 Linux USB driver
* *
* Copyright (C) 2004-2010 Markus Grabner (grabner@icg.tugraz.at) * Copyright (C) 2004-2010 Markus Grabner (line6@grabner-graz.at)
*/ */
#include <linux/slab.h> #include <linux/slab.h>
......
sound/usb/line6/midi.h
View file @ 5c94bdab
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/* /*
* Line 6 Linux USB driver * Line 6 Linux USB driver
* *
* Copyright (C) 2004-2010 Markus Grabner (grabner@icg.tugraz.at) * Copyright (C) 2004-2010 Markus Grabner (line6@grabner-graz.at)
*/ */
#ifndef MIDI_H #ifndef MIDI_H
......
sound/usb/line6/midibuf.c
View file @ 5c94bdab
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/* /*
* Line 6 Linux USB driver * Line 6 Linux USB driver
* *
* Copyright (C) 2004-2010 Markus Grabner (grabner@icg.tugraz.at) * Copyright (C) 2004-2010 Markus Grabner (line6@grabner-graz.at)
*/ */
#include <linux/slab.h> #include <linux/slab.h>
......
sound/usb/line6/midibuf.h
View file @ 5c94bdab
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/* /*
* Line 6 Linux USB driver * Line 6 Linux USB driver
* *
* Copyright (C) 2004-2010 Markus Grabner (grabner@icg.tugraz.at) * Copyright (C) 2004-2010 Markus Grabner (line6@grabner-graz.at)
*/ */
#ifndef MIDIBUF_H #ifndef MIDIBUF_H
......
sound/usb/line6/pcm.c
View file @ 5c94bdab
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/* /*
* Line 6 Linux USB driver * Line 6 Linux USB driver
* *
* Copyright (C) 2004-2010 Markus Grabner (grabner@icg.tugraz.at) * Copyright (C) 2004-2010 Markus Grabner (line6@grabner-graz.at)
*/ */
#include <linux/slab.h> #include <linux/slab.h>
......
sound/usb/line6/pcm.h
View file @ 5c94bdab
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/* /*
* Line 6 Linux USB driver * Line 6 Linux USB driver
* *
* Copyright (C) 2004-2010 Markus Grabner (grabner@icg.tugraz.at) * Copyright (C) 2004-2010 Markus Grabner (line6@grabner-graz.at)
*/ */
/* /*
......
sound/usb/line6/playback.c
View file @ 5c94bdab
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/* /*
* Line 6 Linux USB driver * Line 6 Linux USB driver
* *
* Copyright (C) 2004-2010 Markus Grabner (grabner@icg.tugraz.at) * Copyright (C) 2004-2010 Markus Grabner (line6@grabner-graz.at)
*/ */
#include <linux/slab.h> #include <linux/slab.h>
......
sound/usb/line6/playback.h
View file @ 5c94bdab
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/* /*
* Line 6 Linux USB driver * Line 6 Linux USB driver
* *
* Copyright (C) 2004-2010 Markus Grabner (grabner@icg.tugraz.at) * Copyright (C) 2004-2010 Markus Grabner (line6@grabner-graz.at)
*/ */
#ifndef PLAYBACK_H #ifndef PLAYBACK_H
......
sound/usb/line6/pod.c
View file @ 5c94bdab
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/* /*
* Line 6 Linux USB driver * Line 6 Linux USB driver
* *
* Copyright (C) 2004-2010 Markus Grabner (grabner@icg.tugraz.at) * Copyright (C) 2004-2010 Markus Grabner (line6@grabner-graz.at)
*/ */
#include <linux/slab.h> #include <linux/slab.h>
......
sound/usb/line6/toneport.c
View file @ 5c94bdab
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/* /*
* Line 6 Linux USB driver * Line 6 Linux USB driver
* *
* Copyright (C) 2004-2010 Markus Grabner (grabner@icg.tugraz.at) * Copyright (C) 2004-2010 Markus Grabner (line6@grabner-graz.at)
* Emil Myhrman (emil.myhrman@gmail.com) * Emil Myhrman (emil.myhrman@gmail.com)
*/ */
......
sound/usb/line6/variax.c
View file @ 5c94bdab
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/* /*
* Line 6 Linux USB driver * Line 6 Linux USB driver
* *
* Copyright (C) 2004-2010 Markus Grabner (grabner@icg.tugraz.at) * Copyright (C) 2004-2010 Markus Grabner (line6@grabner-graz.at)
*/ */
#include <linux/slab.h> #include <linux/slab.h>
......
sound/usb/mixer_scarlett2.c
View file @ 5c94bdab
...@@ -5613,6 +5613,8 @@ static int scarlett2_update_filter_values(struct usb_mixer_interface *mixer) ...@@ -5613,6 +5613,8 @@ static int scarlett2_update_filter_values(struct usb_mixer_interface *mixer)
info->peq_flt_total_count * info->peq_flt_total_count *
SCARLETT2_BIQUAD_COEFFS, SCARLETT2_BIQUAD_COEFFS,
peq_flt_values); peq_flt_values);
if (err < 0)
return err;
for (i = 0, dst_idx = 0; i < info->dsp_input_count; i++) { for (i = 0, dst_idx = 0; i < info->dsp_input_count; i++) {
src_idx = i * src_idx = i *
......
sound/usb/stream.c
View file @ 5c94bdab
...@@ -1067,6 +1067,7 @@ snd_usb_get_audioformat_uac3(struct snd_usb_audio *chip, ...@@ -1067,6 +1067,7 @@ snd_usb_get_audioformat_uac3(struct snd_usb_audio *chip,
UAC3_BADD_PD_ID10 : UAC3_BADD_PD_ID11; UAC3_BADD_PD_ID10 : UAC3_BADD_PD_ID11;
pd->pd_d1d0_rec = UAC3_BADD_PD_RECOVER_D1D0; pd->pd_d1d0_rec = UAC3_BADD_PD_RECOVER_D1D0;
pd->pd_d2d0_rec = UAC3_BADD_PD_RECOVER_D2D0; pd->pd_d2d0_rec = UAC3_BADD_PD_RECOVER_D2D0;
pd->ctrl_iface = ctrl_intf;
} else { } else {
fp->attributes = parse_uac_endpoint_attributes(chip, alts, fp->attributes = parse_uac_endpoint_attributes(chip, alts,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7