Merge branch 'asoc-5.4' into asoc-5.5 (25317997) · Commits · EulixOS / Software / Kernel

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/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;
		}

sound/soc/codecs/wm8994.c

+26 −17

Original line number	Diff line number	Diff line
		@@ -533,13 +533,10 @@ static SOC_ENUM_SINGLE_DECL(dac_osr,
		static SOC_ENUM_SINGLE_DECL(adc_osr,
		WM8994_OVERSAMPLING, 1, osr_text);

		static const struct snd_kcontrol_new wm8994_snd_controls[] = {
		static const struct snd_kcontrol_new wm8994_common_snd_controls[] = {
		SOC_DOUBLE_R_TLV("AIF1ADC1 Volume", WM8994_AIF1_ADC1_LEFT_VOLUME,
		WM8994_AIF1_ADC1_RIGHT_VOLUME,
		1, 119, 0, digital_tlv),
		SOC_DOUBLE_R_TLV("AIF1ADC2 Volume", WM8994_AIF1_ADC2_LEFT_VOLUME,
		WM8994_AIF1_ADC2_RIGHT_VOLUME,
		1, 119, 0, digital_tlv),
		SOC_DOUBLE_R_TLV("AIF2ADC Volume", WM8994_AIF2_ADC_LEFT_VOLUME,
		WM8994_AIF2_ADC_RIGHT_VOLUME,
		1, 119, 0, digital_tlv),
		@@ -556,8 +553,6 @@ SOC_ENUM("AIF2DACR Source", aif2dacr_src),

		SOC_DOUBLE_R_TLV("AIF1DAC1 Volume", WM8994_AIF1_DAC1_LEFT_VOLUME,
		WM8994_AIF1_DAC1_RIGHT_VOLUME, 1, 96, 0, digital_tlv),
		SOC_DOUBLE_R_TLV("AIF1DAC2 Volume", WM8994_AIF1_DAC2_LEFT_VOLUME,
		WM8994_AIF1_DAC2_RIGHT_VOLUME, 1, 96, 0, digital_tlv),
		SOC_DOUBLE_R_TLV("AIF2DAC Volume", WM8994_AIF2_DAC_LEFT_VOLUME,
		WM8994_AIF2_DAC_RIGHT_VOLUME, 1, 96, 0, digital_tlv),

		@@ -565,17 +560,12 @@ SOC_SINGLE_TLV("AIF1 Boost Volume", WM8994_AIF1_CONTROL_2, 10, 3, 0, aif_tlv),
		SOC_SINGLE_TLV("AIF2 Boost Volume", WM8994_AIF2_CONTROL_2, 10, 3, 0, aif_tlv),

		SOC_SINGLE("AIF1DAC1 EQ Switch", WM8994_AIF1_DAC1_EQ_GAINS_1, 0, 1, 0),
		SOC_SINGLE("AIF1DAC2 EQ Switch", WM8994_AIF1_DAC2_EQ_GAINS_1, 0, 1, 0),
		SOC_SINGLE("AIF2 EQ Switch", WM8994_AIF2_EQ_GAINS_1, 0, 1, 0),

		WM8994_DRC_SWITCH("AIF1DAC1 DRC Switch", WM8994_AIF1_DRC1_1, 2),
		WM8994_DRC_SWITCH("AIF1ADC1L DRC Switch", WM8994_AIF1_DRC1_1, 1),
		WM8994_DRC_SWITCH("AIF1ADC1R DRC Switch", WM8994_AIF1_DRC1_1, 0),

		WM8994_DRC_SWITCH("AIF1DAC2 DRC Switch", WM8994_AIF1_DRC2_1, 2),
		WM8994_DRC_SWITCH("AIF1ADC2L DRC Switch", WM8994_AIF1_DRC2_1, 1),
		WM8994_DRC_SWITCH("AIF1ADC2R DRC Switch", WM8994_AIF1_DRC2_1, 0),

		WM8994_DRC_SWITCH("AIF2DAC DRC Switch", WM8994_AIF2_DRC_1, 2),
		WM8994_DRC_SWITCH("AIF2ADCL DRC Switch", WM8994_AIF2_DRC_1, 1),
		WM8994_DRC_SWITCH("AIF2ADCR DRC Switch", WM8994_AIF2_DRC_1, 0),
		@@ -594,9 +584,6 @@ SOC_SINGLE("Sidetone HPF Switch", WM8994_SIDETONE, 6, 1, 0),
		SOC_ENUM("AIF1ADC1 HPF Mode", aif1adc1_hpf),
		SOC_DOUBLE("AIF1ADC1 HPF Switch", WM8994_AIF1_ADC1_FILTERS, 12, 11, 1, 0),

		SOC_ENUM("AIF1ADC2 HPF Mode", aif1adc2_hpf),
		SOC_DOUBLE("AIF1ADC2 HPF Switch", WM8994_AIF1_ADC2_FILTERS, 12, 11, 1, 0),

		SOC_ENUM("AIF2ADC HPF Mode", aif2adc_hpf),
		SOC_DOUBLE("AIF2ADC HPF Switch", WM8994_AIF2_ADC_FILTERS, 12, 11, 1, 0),

		@@ -637,6 +624,24 @@ SOC_SINGLE("AIF2DAC 3D Stereo Switch", WM8994_AIF2_DAC_FILTERS_2,
		8, 1, 0),
		};

		/* Controls not available on WM1811 */
		static const struct snd_kcontrol_new wm8994_snd_controls[] = {
		SOC_DOUBLE_R_TLV("AIF1ADC2 Volume", WM8994_AIF1_ADC2_LEFT_VOLUME,
		WM8994_AIF1_ADC2_RIGHT_VOLUME,
		1, 119, 0, digital_tlv),
		SOC_DOUBLE_R_TLV("AIF1DAC2 Volume", WM8994_AIF1_DAC2_LEFT_VOLUME,
		WM8994_AIF1_DAC2_RIGHT_VOLUME, 1, 96, 0, digital_tlv),

		SOC_SINGLE("AIF1DAC2 EQ Switch", WM8994_AIF1_DAC2_EQ_GAINS_1, 0, 1, 0),

		WM8994_DRC_SWITCH("AIF1DAC2 DRC Switch", WM8994_AIF1_DRC2_1, 2),
		WM8994_DRC_SWITCH("AIF1ADC2L DRC Switch", WM8994_AIF1_DRC2_1, 1),
		WM8994_DRC_SWITCH("AIF1ADC2R DRC Switch", WM8994_AIF1_DRC2_1, 0),

		SOC_ENUM("AIF1ADC2 HPF Mode", aif1adc2_hpf),
		SOC_DOUBLE("AIF1ADC2 HPF Switch", WM8994_AIF1_ADC2_FILTERS, 12, 11, 1, 0),
		};

		static const struct snd_kcontrol_new wm8994_eq_controls[] = {
		SOC_SINGLE_TLV("AIF1DAC1 EQ1 Volume", WM8994_AIF1_DAC1_EQ_GAINS_1, 11, 31, 0,
		eq_tlv),
		@@ -4385,13 +4390,15 @@ static int wm8994_component_probe(struct snd_soc_component *component)
		wm8994_handle_pdata(wm8994);

		wm_hubs_add_analogue_controls(component);
		snd_soc_add_component_controls(component, wm8994_snd_controls,
		ARRAY_SIZE(wm8994_snd_controls));
		snd_soc_add_component_controls(component, wm8994_common_snd_controls,
		ARRAY_SIZE(wm8994_common_snd_controls));
		snd_soc_dapm_new_controls(dapm, wm8994_dapm_widgets,
		ARRAY_SIZE(wm8994_dapm_widgets));

		switch (control->type) {
		case WM8994:
		snd_soc_add_component_controls(component, wm8994_snd_controls,
		ARRAY_SIZE(wm8994_snd_controls));
		snd_soc_dapm_new_controls(dapm, wm8994_specific_dapm_widgets,
		ARRAY_SIZE(wm8994_specific_dapm_widgets));
		if (control->revision < 4) {
		@@ -4411,6 +4418,8 @@ static int wm8994_component_probe(struct snd_soc_component *component)
		}
		break;
		case WM8958:
		snd_soc_add_component_controls(component, wm8994_snd_controls,
		ARRAY_SIZE(wm8994_snd_controls));
		snd_soc_add_component_controls(component, wm8958_snd_controls,
		ARRAY_SIZE(wm8958_snd_controls));
		snd_soc_dapm_new_controls(dapm, wm8958_dapm_widgets,

sound/soc/codecs/wm_adsp.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -3697,11 +3697,16 @@ static int wm_adsp_buffer_parse_legacy(struct wm_adsp *dsp)
		u32 xmalg, addr, magic;
		int i, ret;

		alg_region = wm_adsp_find_alg_region(dsp, WMFW_ADSP2_XM, dsp->fw_id);
		if (!alg_region) {
		adsp_err(dsp, "No algorithm region found\n");
		return -EINVAL;
		}

		buf = wm_adsp_buffer_alloc(dsp);
		if (!buf)
		return -ENOMEM;

		alg_region = wm_adsp_find_alg_region(dsp, WMFW_ADSP2_XM, dsp->fw_id);
		xmalg = dsp->ops->sys_config_size / sizeof(__be32);

		addr = alg_region->base + xmalg + ALG_XM_FIELD(magic);