Commit 53b5fdb6 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-fix-v6.7-merge-window' of... 

Merge tag 'asoc-fix-v6.7-merge-window' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v6.7

A collection of fixes that have come in during the merge window, the
majority of this is driver specific with one core fix for handling of
DAPM clock widgets when a name prefix is specified for the card - the
name should not be applied to the clock name we request from the clock
API.
parents f0d9da19 45f2f28b

sound/soc/amd/acp/acp-i2s.c

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 


#define DRV_NAME "acp_i2s_playcap"

#define	I2S_MASTER_MODE_ENABLE		1

#define	I2S_MODE_ENABLE			0

#define	LRCLK_DIV_FIELD			GENMASK(10, 2)

#define	BCLK_DIV_FIELD			GENMASK(23, 11)

#define	ACP63_LRCLK_DIV_FIELD		GENMASK(12, 2)
@@ -56,7 +55,8 @@ static inline void acp_set_i2s_clk(struct acp_dev_data *adata, int dai_id) 
	}



	val  = I2S_MASTER_MODE_ENABLE;

	val |= I2S_MODE_ENABLE & BIT(1);

	if (adata->tdm_mode)

		val |= BIT(1);



	switch (chip->acp_rev) {

	case ACP63_DEV:

sound/soc/codecs/aw88395/aw88395.c

+1 −1
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ static const struct snd_kcontrol_new aw88395_controls[] = { 
		aw88395_get_fade_in_time, aw88395_set_fade_in_time),

	SOC_SINGLE_EXT("Volume Ramp Down Step", 0, 0, FADE_TIME_MAX, FADE_TIME_MIN,

		aw88395_get_fade_out_time, aw88395_set_fade_out_time),

	SOC_SINGLE_EXT("Calib", 0, 0, 100, 0,

	SOC_SINGLE_EXT("Calib", 0, 0, AW88395_CALI_RE_MAX, 0,

		aw88395_re_get, aw88395_re_set),

	AW88395_PROFILE_EXT("Profile Set", aw88395_profile_info,

		aw88395_profile_get, aw88395_profile_set),

sound/soc/codecs/aw88399.c

+4 −4
Original line number Diff line number Diff line
@@ -438,7 +438,7 @@ static int aw_dev_set_vcalb(struct aw88399 *aw88399) 
	if (ret)

		return ret;



	vsense_select = vsense_select & (~AW88399_VDSEL_MASK);

	vsense_select = vsense_value & (~AW88399_VDSEL_MASK);



	ret = aw88399_dev_get_icalk(aw88399, &icalk);

	if (ret) {
@@ -486,8 +486,8 @@ static int aw_dev_update_cali_re(struct aw_cali_desc *cali_desc) 
	u32 cali_re;

	int ret;



	if ((aw_dev->cali_desc.cali_re <= AW88399_CALI_RE_MAX) ||

			(aw_dev->cali_desc.cali_re >= AW88399_CALI_RE_MIN))

	if ((aw_dev->cali_desc.cali_re >= AW88399_CALI_RE_MAX) ||

			(aw_dev->cali_desc.cali_re <= AW88399_CALI_RE_MIN))

		return -EINVAL;



	cali_re = AW88399_SHOW_RE_TO_DSP_RE((aw_dev->cali_desc.cali_re +
@@ -1710,7 +1710,7 @@ static const struct snd_kcontrol_new aw88399_controls[] = { 
		aw88399_get_fade_in_time, aw88399_set_fade_in_time),

	SOC_SINGLE_EXT("Volume Ramp Down Step", 0, 0, FADE_TIME_MAX, FADE_TIME_MIN,

		aw88399_get_fade_out_time, aw88399_set_fade_out_time),

	SOC_SINGLE_EXT("Calib", 0, 0, 100, 0,

	SOC_SINGLE_EXT("Calib", 0, 0, AW88399_CALI_RE_MAX, 0,

		aw88399_re_get, aw88399_re_set),

	AW88399_PROFILE_EXT("AW88399 Profile Set", aw88399_profile_info,

		aw88399_profile_get, aw88399_profile_set),

sound/soc/codecs/aw88399.h

+1 −1
Original line number Diff line number Diff line
@@ -522,7 +522,7 @@ enum { 


enum {

	AW88399_DEV_VDSEL_DAC = 0,

	AW88399_DEV_VDSEL_VSENSE = 1,

	AW88399_DEV_VDSEL_VSENSE = 32,

};



enum {

sound/soc/codecs/da7219-aad.c

+7 −2
Original line number Diff line number Diff line
@@ -927,10 +927,15 @@ void da7219_aad_suspend(struct snd_soc_component *component) 
	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);

	u8 micbias_ctrl;



	disable_irq(da7219_aad->irq);



	if (da7219_aad->jack) {

		/* Disable jack detection during suspend */

		snd_soc_component_update_bits(component, DA7219_ACCDET_CONFIG_1,

				    DA7219_ACCDET_EN_MASK, 0);

		cancel_delayed_work_sync(&da7219_aad->jack_det_work);

		/* Disable ground switch */

		snd_soc_component_update_bits(component, 0xFB, 0x01, 0x00);



		/*

		 * If we have a 4-pole jack inserted, then micbias will be
@@ -947,8 +952,6 @@ void da7219_aad_suspend(struct snd_soc_component *component) 
			}

		}

	}



	synchronize_irq(da7219_aad->irq);

}



void da7219_aad_resume(struct snd_soc_component *component)
@@ -971,6 +974,8 @@ void da7219_aad_resume(struct snd_soc_component *component) 
				    DA7219_ACCDET_EN_MASK,

				    DA7219_ACCDET_EN_MASK);

	}



	enable_irq(da7219_aad->irq);

}