Skip to content

Commit 5414aea

Browse files
committed
Merge tag 'sound-6.7-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai: "Apparently there were so many kids wishing bug fixes that made Santa busy; here we have lots of fixes although it's a bit late. But all changes are device-specific, hence it should be relatively safe to apply. Most of changes are for Cirrus codecs (for both ASoC and HD-audio), while the remaining are fixes for TI codecs, HD-audio and USB-audio quirks" * tag 'sound-6.7-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (24 commits) ALSA: hda: cs35l41: Only add SPI CS GPIO if SPI is enabled in kernel ALSA: hda: cs35l41: Do not allow uninitialised variables to be freed ASoC: fsl_sai: Fix channel swap issue on i.MX8MP ASoC: hdmi-codec: fix missing report for jack initial status ALSA: hda/realtek: Add quirks for ASUS Zenbook 2023 Models ALSA: hda: cs35l41: Support additional ASUS Zenbook 2023 Models ALSA: hda/realtek: Add quirks for ASUS Zenbook 2022 Models ALSA: hda: cs35l41: Support additional ASUS Zenbook 2022 Models ALSA: hda/realtek: Add quirks for ASUS ROG 2023 models ALSA: hda: cs35l41: Support additional ASUS ROG 2023 models ALSA: hda: cs35l41: Add config table to support many laptops without _DSD ASoC: Intel: bytcr_rt5640: Add new swapped-speakers quirk ASoC: Intel: bytcr_rt5640: Add quirk for the Medion Lifetab S10346 kselftest: alsa: fixed a print formatting warning ALSA: usb-audio: Increase delay in MOTU M quirk ASoC: tas2781: check the validity of prm_no/cfg_no ALSA: hda/tas2781: select program 0, conf 0 by default ALSA: hda/realtek: Add quirk for ASUS ROG GV302XA ASoC: cs42l43: Don't enable bias sense during type detect ASoC: Intel: soc-acpi-intel-mtl-match: Change CS35L56 prefixes to AMPn ...
2 parents 2618280 + 916d051 commit 5414aea

File tree

17 files changed

+478
-96
lines changed

17 files changed

+478
-96
lines changed

sound/pci/hda/cs35l41_hda.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1826,6 +1826,7 @@ int cs35l41_hda_probe(struct device *dev, const char *device_name, int id, int i
18261826
if (cs35l41_safe_reset(cs35l41->regmap, cs35l41->hw_cfg.bst_type))
18271827
gpiod_set_value_cansleep(cs35l41->reset_gpio, 0);
18281828
gpiod_put(cs35l41->reset_gpio);
1829+
gpiod_put(cs35l41->cs_gpio);
18291830
acpi_dev_put(cs35l41->dacpi);
18301831
kfree(cs35l41->acpi_subsystem_id);
18311832

@@ -1853,6 +1854,7 @@ void cs35l41_hda_remove(struct device *dev)
18531854
if (cs35l41_safe_reset(cs35l41->regmap, cs35l41->hw_cfg.bst_type))
18541855
gpiod_set_value_cansleep(cs35l41->reset_gpio, 0);
18551856
gpiod_put(cs35l41->reset_gpio);
1857+
gpiod_put(cs35l41->cs_gpio);
18561858
kfree(cs35l41->acpi_subsystem_id);
18571859
}
18581860
EXPORT_SYMBOL_NS_GPL(cs35l41_hda_remove, SND_HDA_SCODEC_CS35L41);

sound/pci/hda/cs35l41_hda.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ struct cs35l41_amp_efi_data {
3535
} __packed;
3636

3737
enum cs35l41_hda_spk_pos {
38-
CS35l41_LEFT,
39-
CS35l41_RIGHT,
38+
CS35L41_LEFT,
39+
CS35L41_RIGHT,
4040
};
4141

4242
enum cs35l41_hda_gpio_function {
@@ -50,6 +50,7 @@ struct cs35l41_hda {
5050
struct device *dev;
5151
struct regmap *regmap;
5252
struct gpio_desc *reset_gpio;
53+
struct gpio_desc *cs_gpio;
5354
struct cs35l41_hw_cfg hw_cfg;
5455
struct hda_codec *codec;
5556

0 commit comments

Comments
 (0)