]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
sound: codecs: tlv320adcx140: assorted patches
authorMark Brown <broonie@kernel.org>
Wed, 14 Jan 2026 20:11:26 +0000 (20:11 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 14 Jan 2026 20:11:26 +0000 (20:11 +0000)
Merge series from Sascha Hauer <s.hauer@pengutronix.de>:

These are some patches for the tlv320adcx140 codec we are carrying
around for a while, time to upstream them.

1  2 
sound/soc/sdw_utils/soc_sdw_utils.c
sound/soc/sof/intel/hda.c

Simple merge
index 72c98154c027e59a01f0b441da60c21681a9d523,0bb85f92e1069d0a6ab83376f80a91f07f5e4593..d88ec66728fd9cfcd4e966669311693ba263234e
@@@ -1609,8 -1622,8 +1622,7 @@@ struct snd_soc_acpi_mach *hda_machine_s
                if (tplg_fixup &&
                    mach->tplg_quirk_mask & SND_SOC_ACPI_TPLG_INTEL_SSP_NUMBER &&
                    mach->mach_params.i2s_link_mask) {
-                       const struct sof_intel_dsp_desc *chip = get_chip_info(sdev->pdata);
                        int ssp_num;
 -                      int mclk_mask;
  
                        if (hweight_long(mach->mach_params.i2s_link_mask) > 1 &&
                            !(mach->tplg_quirk_mask & SND_SOC_ACPI_TPLG_INTEL_SSP_MSB))