Commit c8d2dcb3 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-fix-v5.4-rc4' of... 

Merge tag 'asoc-fix-v5.4-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v5.4

A collection of fixes that have arrived since the merge window.  There
are a small number of core fixes here but they are smaller ones around
error handling.
parents 83629532 95a32c98

include/sound/simple_card_utils.h

+4 −4
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ int asoc_simple_init_priv(struct asoc_simple_priv *priv, 
			       struct link_info *li);



#ifdef DEBUG

inline void asoc_simple_debug_dai(struct asoc_simple_priv *priv,

static inline void asoc_simple_debug_dai(struct asoc_simple_priv *priv,

					 char *name,

					 struct asoc_simple_dai *dai)

{
@@ -167,7 +167,7 @@ inline void asoc_simple_debug_dai(struct asoc_simple_priv *priv, 
		dev_dbg(dev, "%s clk %luHz\n", name, clk_get_rate(dai->clk));

}



inline void asoc_simple_debug_info(struct asoc_simple_priv *priv)

static inline void asoc_simple_debug_info(struct asoc_simple_priv *priv)

{

	struct snd_soc_card *card = simple_priv_to_card(priv);

	struct device *dev = simple_priv_to_dev(priv);

sound/soc/codecs/max98373.c

+12 −8
Original line number Diff line number Diff line
@@ -901,7 +901,7 @@ static void max98373_slot_config(struct i2c_client *i2c, 
		max98373->i_slot = value & 0xF;

	else

		max98373->i_slot = 1;



	if (dev->of_node) {

		max98373->reset_gpio = of_get_named_gpio(dev->of_node,

						"maxim,reset-gpio", 0);

		if (!gpio_is_valid(max98373->reset_gpio)) {
@@ -912,6 +912,10 @@ static void max98373_slot_config(struct i2c_client *i2c, 
			dev_dbg(dev, "maxim,reset-gpio=%d",

				max98373->reset_gpio);

		}

	} else {

		/* this makes reset_gpio as invalid */

		max98373->reset_gpio = -1;

	}



	if (!device_property_read_u32(dev, "maxim,spkfb-slot-no", &value))

		max98373->spkfb_slot = value & 0xF;

sound/soc/codecs/msm8916-wcd-digital.c

+22 −0
Original line number Diff line number Diff line
@@ -243,6 +243,10 @@ static const char *const rx_mix1_text[] = { 
	"ZERO", "IIR1", "IIR2", "RX1", "RX2", "RX3"

};



static const char * const rx_mix2_text[] = {

	"ZERO", "IIR1", "IIR2"

};



static const char *const dec_mux_text[] = {

	"ZERO", "ADC1", "ADC2", "ADC3", "DMIC1", "DMIC2"

};
@@ -270,6 +274,16 @@ static const struct soc_enum rx3_mix1_inp_enum[] = { 
	SOC_ENUM_SINGLE(LPASS_CDC_CONN_RX3_B2_CTL, 0, 6, rx_mix1_text),

};



/* RX1 MIX2 */

static const struct soc_enum rx_mix2_inp1_chain_enum =

	SOC_ENUM_SINGLE(LPASS_CDC_CONN_RX1_B3_CTL,

		0, 3, rx_mix2_text);



/* RX2 MIX2 */

static const struct soc_enum rx2_mix2_inp1_chain_enum =

	SOC_ENUM_SINGLE(LPASS_CDC_CONN_RX2_B3_CTL,

		0, 3, rx_mix2_text);



/* DEC */

static const struct soc_enum dec1_mux_enum = SOC_ENUM_SINGLE(

				LPASS_CDC_CONN_TX_B1_CTL, 0, 6, dec_mux_text);
@@ -309,6 +323,10 @@ static const struct snd_kcontrol_new rx3_mix1_inp2_mux = SOC_DAPM_ENUM( 
				"RX3 MIX1 INP2 Mux", rx3_mix1_inp_enum[1]);

static const struct snd_kcontrol_new rx3_mix1_inp3_mux = SOC_DAPM_ENUM(

				"RX3 MIX1 INP3 Mux", rx3_mix1_inp_enum[2]);

static const struct snd_kcontrol_new rx1_mix2_inp1_mux = SOC_DAPM_ENUM(

				"RX1 MIX2 INP1 Mux", rx_mix2_inp1_chain_enum);

static const struct snd_kcontrol_new rx2_mix2_inp1_mux = SOC_DAPM_ENUM(

				"RX2 MIX2 INP1 Mux", rx2_mix2_inp1_chain_enum);



/* Digital Gain control -38.4 dB to +38.4 dB in 0.3 dB steps */

static const DECLARE_TLV_DB_SCALE(digital_gain, -3840, 30, 0);
@@ -740,6 +758,10 @@ static const struct snd_soc_dapm_widget msm8916_wcd_digital_dapm_widgets[] = { 
			 &rx3_mix1_inp2_mux),

	SND_SOC_DAPM_MUX("RX3 MIX1 INP3", SND_SOC_NOPM, 0, 0,

			 &rx3_mix1_inp3_mux),

	SND_SOC_DAPM_MUX("RX1 MIX2 INP1", SND_SOC_NOPM, 0, 0,

			 &rx1_mix2_inp1_mux),

	SND_SOC_DAPM_MUX("RX2 MIX2 INP1", SND_SOC_NOPM, 0, 0,

			 &rx2_mix2_inp1_mux),



	SND_SOC_DAPM_MUX("CIC1 MUX", SND_SOC_NOPM, 0, 0, &cic1_mux),

	SND_SOC_DAPM_MUX("CIC2 MUX", SND_SOC_NOPM, 0, 0, &cic2_mux),

sound/soc/codecs/rt5651.c

+3 −0
Original line number Diff line number Diff line
@@ -1770,6 +1770,9 @@ static int rt5651_detect_headset(struct snd_soc_component *component) 


static bool rt5651_support_button_press(struct rt5651_priv *rt5651)

{

	if (!rt5651->hp_jack)

		return false;



	/* Button press support only works with internal jack-detection */

	return (rt5651->hp_jack->status & SND_JACK_MICROPHONE) &&

		rt5651->gpiod_hp_det == NULL;

sound/soc/codecs/rt5682.c

+10 −2
Original line number Diff line number Diff line
@@ -995,6 +995,16 @@ static int rt5682_set_jack_detect(struct snd_soc_component *component, 
{

	struct rt5682_priv *rt5682 = snd_soc_component_get_drvdata(component);



	rt5682->hs_jack = hs_jack;



	if (!hs_jack) {

		regmap_update_bits(rt5682->regmap, RT5682_IRQ_CTRL_2,

				   RT5682_JD1_EN_MASK, RT5682_JD1_DIS);

		regmap_update_bits(rt5682->regmap, RT5682_RC_CLK_CTRL,

				   RT5682_POW_JDH | RT5682_POW_JDL, 0);

		return 0;

	}



	switch (rt5682->pdata.jd_src) {

	case RT5682_JD1:

		snd_soc_component_update_bits(component, RT5682_CBJ_CTRL_2,
@@ -1032,8 +1042,6 @@ static int rt5682_set_jack_detect(struct snd_soc_component *component, 
		break;

	}



	rt5682->hs_jack = hs_jack;



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE