Commit 3551e679 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-fix-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "A collection of device-specific fixes that have been gathered since
  the previous pull:

   - A few more HD-audio quirks and fixups

   - A series of Qualcomm AudioReach fixes

   - Various small fixes for ASoC rt5665, WSA, SOF and Cirrus"

* tag 'sound-fix-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda/realtek: Fix built-in mic on another ASUS VivoBook model
  ALSA: hda/realtek - Support mute led function for HP platform
  ASoC: imx-card: Add NULL check in imx_card_probe()
  ASoC: codecs: rt5665: Fix some error handling paths in rt5665_probe()
  ASoC: q6apm-dai: make use of q6apm_get_hw_pointer
  ASoC: qdsp6: q6apm-dai: fix capture pipeline overruns.
  ASoC: qdsp6: q6apm-dai: set 10 ms period and buffer alignment.
  ASoC: q6apm: add q6apm_get_hw_pointer helper
  ASoC: q6apm-dai: schedule all available frames to avoid dsp under-runs
  ASoC: SOF: hda/ptl: Move mic privacy change notification sending to a work
  ALSA/hda: intel-sdw-acpi: Remove (explicitly) unused header
  ALSA: hda/realtek: Enable Mute LED on HP OMEN 16 Laptop xd000xx
  ALSA: hda/tas2781: Upgrade calibratd-data writing code to support Alpha and Beta dsp firmware
  ASoC: qdsp6: q6asm-dai: fix q6asm_dai_compr_set_params error path
  ALSA: hda/realtek: Fix built-in mic breakage on ASUS VivoBook X515JA
  ASoC: sma1307: Fix error handling in sma1307_setting_loaded()
  ASoC: codecs: wsa884x: Correct VI sense channel mask
  ASoC: codecs: wsa883x: Correct VI sense channel mask
  firmware: cs_dsp: Ensure cs_dsp_load[_coeff]() returns 0 on success
parents e48e99b6 02dc9b96

drivers/firmware/cirrus/cs_dsp.c

+2 −0
Original line number Diff line number Diff line
@@ -1631,6 +1631,7 @@ static int cs_dsp_load(struct cs_dsp *dsp, const struct firmware *firmware, 


	cs_dsp_debugfs_save_wmfwname(dsp, file);



	ret = 0;

out_fw:

	cs_dsp_buf_free(&buf_list);
@@ -2338,6 +2339,7 @@ static int cs_dsp_load_coeff(struct cs_dsp *dsp, const struct firmware *firmware 


	cs_dsp_debugfs_save_binname(dsp, file);



	ret = 0;

out_fw:

	cs_dsp_buf_free(&buf_list);

sound/hda/intel-sdw-acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -11,8 +11,8 @@ 
#include <linux/device.h>

#include <linux/errno.h>

#include <linux/export.h>

#include <linux/fwnode.h>

#include <linux/module.h>

#include <linux/property.h>

#include <linux/soundwire/sdw_intel.h>

#include <linux/string.h>

sound/pci/hda/patch_realtek.c

+56 −9
Original line number Diff line number Diff line
@@ -4743,6 +4743,22 @@ static void alc245_fixup_hp_mute_led_coefbit(struct hda_codec *codec, 
	}

}



static void alc245_fixup_hp_mute_led_v1_coefbit(struct hda_codec *codec,

					  const struct hda_fixup *fix,

					  int action)

{

	struct alc_spec *spec = codec->spec;



	if (action == HDA_FIXUP_ACT_PRE_PROBE) {

		spec->mute_led_polarity = 0;

		spec->mute_led_coef.idx = 0x0b;

		spec->mute_led_coef.mask = 1 << 3;

		spec->mute_led_coef.on = 1 << 3;

		spec->mute_led_coef.off = 0;

		snd_hda_gen_add_mute_led_cdev(codec, coef_mute_led_set);

	}

}



/* turn on/off mic-mute LED per capture hook by coef bit */

static int coef_micmute_led_set(struct led_classdev *led_cdev,

				enum led_brightness brightness)
@@ -7574,6 +7590,24 @@ static void alc245_fixup_hp_spectre_x360_16_aa0xxx(struct hda_codec *codec, 
	alc245_fixup_hp_gpio_led(codec, fix, action);

}



static void alc245_fixup_hp_zbook_firefly_g12a(struct hda_codec *codec,

					  const struct hda_fixup *fix, int action)

{

	struct alc_spec *spec = codec->spec;

	static const hda_nid_t conn[] = { 0x02 };



	switch (action) {

	case HDA_FIXUP_ACT_PRE_PROBE:

		spec->gen.auto_mute_via_amp = 1;

		snd_hda_override_conn_list(codec, 0x17, ARRAY_SIZE(conn), conn);

		break;

	}



	cs35l41_fixup_i2c_two(codec, fix, action);

	alc245_fixup_hp_mute_led_coefbit(codec, fix, action);

	alc285_fixup_hp_coef_micmute_led(codec, fix, action);

}



/*

 * ALC287 PCM hooks

 */
@@ -7911,6 +7945,7 @@ enum { 
	ALC245_FIXUP_TAS2781_SPI_2,

	ALC287_FIXUP_YOGA7_14ARB7_I2C,

	ALC245_FIXUP_HP_MUTE_LED_COEFBIT,

	ALC245_FIXUP_HP_MUTE_LED_V1_COEFBIT,

	ALC245_FIXUP_HP_X360_MUTE_LEDS,

	ALC287_FIXUP_THINKPAD_I2S_SPK,

	ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD,
@@ -7921,6 +7956,7 @@ enum { 
	ALC256_FIXUP_HEADPHONE_AMP_VOL,

	ALC245_FIXUP_HP_SPECTRE_X360_EU0XXX,

	ALC245_FIXUP_HP_SPECTRE_X360_16_AA0XXX,

	ALC245_FIXUP_HP_ZBOOK_FIREFLY_G12A,

	ALC285_FIXUP_ASUS_GA403U,

	ALC285_FIXUP_ASUS_GA403U_HEADSET_MIC,

	ALC285_FIXUP_ASUS_GA403U_I2C_SPEAKER2_TO_DAC1,
@@ -10164,6 +10200,10 @@ static const struct hda_fixup alc269_fixups[] = { 
		.type = HDA_FIXUP_FUNC,

		.v.func = alc245_fixup_hp_mute_led_coefbit,

	},

	[ALC245_FIXUP_HP_MUTE_LED_V1_COEFBIT] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc245_fixup_hp_mute_led_v1_coefbit,

	},

	[ALC245_FIXUP_HP_X360_MUTE_LEDS] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc245_fixup_hp_mute_led_coefbit,
@@ -10212,6 +10252,10 @@ static const struct hda_fixup alc269_fixups[] = { 
		.type = HDA_FIXUP_FUNC,

		.v.func = alc245_fixup_hp_spectre_x360_16_aa0xxx,

	},

	[ALC245_FIXUP_HP_ZBOOK_FIREFLY_G12A] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc245_fixup_hp_zbook_firefly_g12a,

	},

	[ALC285_FIXUP_ASUS_GA403U] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc285_fixup_asus_ga403u,
@@ -10658,6 +10702,7 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x103c, 0x8b97, "HP", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),

	SND_PCI_QUIRK(0x103c, 0x8bb3, "HP Slim OMEN", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x103c, 0x8bb4, "HP Slim OMEN", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x103c, 0x8bcd, "HP Omen 16-xd0xxx", ALC245_FIXUP_HP_MUTE_LED_V1_COEFBIT),

	SND_PCI_QUIRK(0x103c, 0x8bdd, "HP Envy 17", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x103c, 0x8bde, "HP Envy 17", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x103c, 0x8bdf, "HP Envy 15", ALC287_FIXUP_CS35L41_I2C_2),
@@ -10751,15 +10796,15 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x103c, 0x8e11, "HP Trekker", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x103c, 0x8e12, "HP Trekker", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x103c, 0x8e13, "HP Trekker", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x103c, 0x8e14, "HP ZBook Firefly 14 G12", ALC285_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8e15, "HP ZBook Firefly 14 G12", ALC285_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8e16, "HP ZBook Firefly 14 G12", ALC285_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8e17, "HP ZBook Firefly 14 G12", ALC285_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8e18, "HP ZBook Firefly 14 G12A", ALC285_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8e19, "HP ZBook Firefly 14 G12A", ALC285_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8e1a, "HP ZBook Firefly 14 G12A", ALC285_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8e1b, "HP EliteBook G12", ALC285_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8e1c, "HP EliteBook G12", ALC285_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8e14, "HP ZBook Firefly 14 G12", ALC245_FIXUP_HP_ZBOOK_FIREFLY_G12A),

	SND_PCI_QUIRK(0x103c, 0x8e15, "HP ZBook Firefly 14 G12", ALC245_FIXUP_HP_ZBOOK_FIREFLY_G12A),

	SND_PCI_QUIRK(0x103c, 0x8e16, "HP ZBook Firefly 14 G12", ALC245_FIXUP_HP_ZBOOK_FIREFLY_G12A),

	SND_PCI_QUIRK(0x103c, 0x8e17, "HP ZBook Firefly 14 G12", ALC245_FIXUP_HP_ZBOOK_FIREFLY_G12A),

	SND_PCI_QUIRK(0x103c, 0x8e18, "HP ZBook Firefly 14 G12A", ALC245_FIXUP_HP_ZBOOK_FIREFLY_G12A),

	SND_PCI_QUIRK(0x103c, 0x8e19, "HP ZBook Firefly 14 G12A", ALC245_FIXUP_HP_ZBOOK_FIREFLY_G12A),

	SND_PCI_QUIRK(0x103c, 0x8e1a, "HP ZBook Firefly 14 G12A", ALC245_FIXUP_HP_ZBOOK_FIREFLY_G12A),

	SND_PCI_QUIRK(0x103c, 0x8e1b, "HP EliteBook G12", ALC245_FIXUP_HP_ZBOOK_FIREFLY_G12A),

	SND_PCI_QUIRK(0x103c, 0x8e1c, "HP EliteBook G12", ALC245_FIXUP_HP_ZBOOK_FIREFLY_G12A),

	SND_PCI_QUIRK(0x103c, 0x8e2c, "HP EliteBook 16 G12", ALC285_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8e36, "HP 14 Enstrom OmniBook X", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x103c, 0x8e37, "HP 16 Piston OmniBook X", ALC287_FIXUP_CS35L41_I2C_2),
@@ -10804,6 +10849,7 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1043, 0x1493, "ASUS GV601VV/VU/VJ/VQ/VI", ALC285_FIXUP_ASUS_HEADSET_MIC),

	SND_PCI_QUIRK(0x1043, 0x14d3, "ASUS G614JY/JZ/JG", ALC245_FIXUP_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1043, 0x14e3, "ASUS G513PI/PU/PV", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x1043, 0x14f2, "ASUS VivoBook X515JA", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1043, 0x1503, "ASUS G733PY/PZ/PZV/PYV", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x1043, 0x1517, "Asus Zenbook UX31A", ALC269VB_FIXUP_ASUS_ZENBOOK_UX31A),

	SND_PCI_QUIRK(0x1043, 0x1533, "ASUS GV302XA/XJ/XQ/XU/XV/XI", ALC287_FIXUP_CS35L41_I2C_2),
@@ -10843,6 +10889,7 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1043, 0x1c43, "ASUS UX8406MA", ALC245_FIXUP_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1043, 0x1c62, "ASUS GU603", ALC289_FIXUP_ASUS_GA401),

	SND_PCI_QUIRK(0x1043, 0x1c63, "ASUS GU605M", ALC285_FIXUP_ASUS_GU605_SPI_SPEAKER2_TO_DAC1),

	SND_PCI_QUIRK(0x1043, 0x1c80, "ASUS VivoBook TP401", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1043, 0x1c92, "ASUS ROG Strix G15", ALC285_FIXUP_ASUS_G533Z_PINS),

	SND_PCI_QUIRK(0x1043, 0x1c9f, "ASUS G614JU/JV/JI", ALC285_FIXUP_ASUS_HEADSET_MIC),

	SND_PCI_QUIRK(0x1043, 0x1caf, "ASUS G634JY/JZ/JI/JG", ALC285_FIXUP_ASUS_SPI_REAR_SPEAKERS),

sound/pci/hda/tas2781_hda_i2c.c

+20 −10
Original line number Diff line number Diff line
@@ -558,28 +558,38 @@ static int tas2563_save_calibration(struct tasdevice_priv *tas_priv) 


static void tas2781_apply_calib(struct tasdevice_priv *tas_priv)

{

	static const unsigned char page_array[CALIB_MAX] = {

		0x17, 0x18, 0x18, 0x13, 0x18,

	struct calidata *cali_data = &tas_priv->cali_data;

	struct cali_reg *r = &cali_data->cali_reg_array;

	unsigned int cali_reg[CALIB_MAX] = {

		TASDEVICE_REG(0, 0x17, 0x74),

		TASDEVICE_REG(0, 0x18, 0x0c),

		TASDEVICE_REG(0, 0x18, 0x14),

		TASDEVICE_REG(0, 0x13, 0x70),

		TASDEVICE_REG(0, 0x18, 0x7c),

	};

	static const unsigned char rgno_array[CALIB_MAX] = {

		0x74, 0x0c, 0x14, 0x70, 0x7c,

	};

	int offset = 0;

	int i, j, rc;

	int oft = 0;

	__be32 data;



	if (tas_priv->dspbin_typ != TASDEV_BASIC) {

		cali_reg[0] = r->r0_reg;

		cali_reg[1] = r->invr0_reg;

		cali_reg[2] = r->r0_low_reg;

		cali_reg[3] = r->pow_reg;

		cali_reg[4] = r->tlimit_reg;

	}



	for (i = 0; i < tas_priv->ndev; i++) {

		for (j = 0; j < CALIB_MAX; j++) {

			data = cpu_to_be32(

				*(uint32_t *)&tas_priv->cali_data.data[offset]);

				*(uint32_t *)&tas_priv->cali_data.data[oft]);

			rc = tasdevice_dev_bulk_write(tas_priv, i,

				TASDEVICE_REG(0, page_array[j], rgno_array[j]),

				(unsigned char *)&data, 4);

				cali_reg[j], (unsigned char *)&data, 4);

			if (rc < 0)

				dev_err(tas_priv->dev,

					"chn %d calib %d bulk_wr err = %d\n",

					i, j, rc);

			offset += 4;

			oft += 4;

		}

	}

}

sound/soc/codecs/rt5665.c

+4 −20
Original line number Diff line number Diff line
@@ -31,9 +31,7 @@ 
#include "rl6231.h"

#include "rt5665.h"



#define RT5665_NUM_SUPPLIES 3



static const char *rt5665_supply_names[RT5665_NUM_SUPPLIES] = {

static const char * const rt5665_supply_names[] = {

	"AVDD",

	"MICVDD",

	"VBAT",
@@ -46,7 +44,6 @@ struct rt5665_priv { 
	struct gpio_desc *gpiod_ldo1_en;

	struct gpio_desc *gpiod_reset;

	struct snd_soc_jack *hs_jack;

	struct regulator_bulk_data supplies[RT5665_NUM_SUPPLIES];

	struct delayed_work jack_detect_work;

	struct delayed_work calibrate_work;

	struct delayed_work jd_check_work;
@@ -4471,8 +4468,6 @@ static void rt5665_remove(struct snd_soc_component *component) 
	struct rt5665_priv *rt5665 = snd_soc_component_get_drvdata(component);



	regmap_write(rt5665->regmap, RT5665_RESET, 0);



	regulator_bulk_disable(ARRAY_SIZE(rt5665->supplies), rt5665->supplies);

}



#ifdef CONFIG_PM
@@ -4758,7 +4753,7 @@ static int rt5665_i2c_probe(struct i2c_client *i2c) 
{

	struct rt5665_platform_data *pdata = dev_get_platdata(&i2c->dev);

	struct rt5665_priv *rt5665;

	int i, ret;

	int ret;

	unsigned int val;



	rt5665 = devm_kzalloc(&i2c->dev, sizeof(struct rt5665_priv),
@@ -4774,24 +4769,13 @@ static int rt5665_i2c_probe(struct i2c_client *i2c) 
	else

		rt5665_parse_dt(rt5665, &i2c->dev);



	for (i = 0; i < ARRAY_SIZE(rt5665->supplies); i++)

		rt5665->supplies[i].supply = rt5665_supply_names[i];



	ret = devm_regulator_bulk_get(&i2c->dev, ARRAY_SIZE(rt5665->supplies),

				      rt5665->supplies);

	ret = devm_regulator_bulk_get_enable(&i2c->dev, ARRAY_SIZE(rt5665_supply_names),

					     rt5665_supply_names);

	if (ret != 0) {

		dev_err(&i2c->dev, "Failed to request supplies: %d\n", ret);

		return ret;

	}



	ret = regulator_bulk_enable(ARRAY_SIZE(rt5665->supplies),

				    rt5665->supplies);

	if (ret != 0) {

		dev_err(&i2c->dev, "Failed to enable supplies: %d\n", ret);

		return ret;

	}





	rt5665->gpiod_ldo1_en = devm_gpiod_get_optional(&i2c->dev,

							"realtek,ldo1-en",

							GPIOD_OUT_HIGH);