Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit a8e99234 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'asoc-5.2' into asoc-5.3

parents adb76b5b 04268bf2

sound/hda/ext/hdac_ext_bus.c

+0 −1
Original line number Diff line number Diff line
@@ -170,7 +170,6 @@ EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_device_init); 
void snd_hdac_ext_bus_device_exit(struct hdac_device *hdev)

{

	snd_hdac_device_exit(hdev);

	kfree(hdev);

}

EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_device_exit);

sound/soc/codecs/max98090.c

+16 −0
Original line number Diff line number Diff line
@@ -1909,6 +1909,21 @@ static int max98090_configure_dmic(struct max98090_priv *max98090, 
	return 0;

}



static int max98090_dai_startup(struct snd_pcm_substream *substream,

				struct snd_soc_dai *dai)

{

	struct snd_soc_component *component = dai->component;

	struct max98090_priv *max98090 = snd_soc_component_get_drvdata(component);

	unsigned int fmt = max98090->dai_fmt;



	/* Remove 24-bit format support if it is not in right justified mode. */

	if ((fmt & SND_SOC_DAIFMT_FORMAT_MASK) != SND_SOC_DAIFMT_RIGHT_J) {

		substream->runtime->hw.formats = SNDRV_PCM_FMTBIT_S16_LE;

		snd_pcm_hw_constraint_msbits(substream->runtime, 0, 16, 16);

	}

	return 0;

}



static int max98090_dai_hw_params(struct snd_pcm_substream *substream,

				   struct snd_pcm_hw_params *params,

				   struct snd_soc_dai *dai)
@@ -2316,6 +2331,7 @@ EXPORT_SYMBOL_GPL(max98090_mic_detect); 
#define MAX98090_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE)



static const struct snd_soc_dai_ops max98090_dai_ops = {

	.startup = max98090_dai_startup,

	.set_sysclk = max98090_dai_set_sysclk,

	.set_fmt = max98090_dai_set_fmt,

	.set_tdm_slot = max98090_set_tdm_slot,

sound/soc/codecs/rt274.c

+2 −1
Original line number Diff line number Diff line
@@ -405,6 +405,8 @@ static int rt274_mic_detect(struct snd_soc_component *component, 
{

	struct rt274_priv *rt274 = snd_soc_component_get_drvdata(component);



	rt274->jack = jack;



	if (jack == NULL) {

		/* Disable jack detection */

		regmap_update_bits(rt274->regmap, RT274_EAPD_GPIO_IRQ_CTRL,
@@ -412,7 +414,6 @@ static int rt274_mic_detect(struct snd_soc_component *component, 


		return 0;

	}

	rt274->jack = jack;



	regmap_update_bits(rt274->regmap, RT274_EAPD_GPIO_IRQ_CTRL,

				RT274_IRQ_EN, RT274_IRQ_EN);

sound/soc/intel/boards/bytcht_es8316.c

+1 −1
Original line number Diff line number Diff line
@@ -496,6 +496,7 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev) 
	}



	/* override plaform name, if required */

	byt_cht_es8316_card.dev = dev;

	platform_name = mach->mach_params.platform;



	ret = snd_soc_fixup_dai_links_platform_name(&byt_cht_es8316_card,
@@ -576,7 +577,6 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev) 
		 (quirk & BYT_CHT_ES8316_MONO_SPEAKER) ? "mono" : "stereo",

		 mic_name[BYT_CHT_ES8316_MAP(quirk)]);

	byt_cht_es8316_card.long_name = long_name;

	byt_cht_es8316_card.dev = dev;

	snd_soc_card_set_drvdata(&byt_cht_es8316_card, priv);



	ret = devm_snd_soc_register_card(dev, &byt_cht_es8316_card);

sound/soc/intel/boards/cht_bsw_max98090_ti.c

+1 −1
Original line number Diff line number Diff line
@@ -462,6 +462,7 @@ static int snd_cht_mc_probe(struct platform_device *pdev) 
	}



	/* override plaform name, if required */

	snd_soc_card_cht.dev = &pdev->dev;

	mach = (&pdev->dev)->platform_data;

	platform_name = mach->mach_params.platform;
@@ -471,7 +472,6 @@ static int snd_cht_mc_probe(struct platform_device *pdev) 
		return ret_val;



	/* register the soc card */

	snd_soc_card_cht.dev = &pdev->dev;

	snd_soc_card_set_drvdata(&snd_soc_card_cht, drv);



	if (drv->quirks & QUIRK_PMC_PLT_CLK_0)