Unverified Commit 4d9e07cc authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "ASoC: Intel: machine driver updates for 5.9" from Pierre-Louis... 

Merge series "ASoC: Intel: machine driver updates for 5.9" from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>:

Small patchset to harden the SoundWire machine driver, change bad
HIDs, update PLL settings and avoid memory leaks. Given that the
SoundWire core parts are not upstream it's probably not necessary to
provide the patches to stable branches.

Bard Liao (1):
  ASoC: Intel: sof_sdw_rt711: remove hard-coded codec name

Kai Vehmanen (2):
  ASoC: Intel: sof_sdw: add support for systems without i915 audio
  ASoC: Intel: sof_sdw: avoid crash if invalid DSP topology loaded

Libin Yang (1):
  ASoC: Intel: common: change match table ehl-rt5660

Pierre-Louis Bossart (1):
  ASoC: Intel: sof_sdw_rt711: remove properties in card remove

Yong Zhi (1):
  ASoC: intel: board: sof_rt5682: Update rt1015 pll input clk freq

 sound/soc/intel/boards/sof_rt5682.c           |  9 +++++-
 sound/soc/intel/boards/sof_sdw.c              | 31 +++++++++++++------
 sound/soc/intel/boards/sof_sdw_common.h       |  2 ++
 sound/soc/intel/boards/sof_sdw_hdmi.c         |  6 ++++
 sound/soc/intel/boards/sof_sdw_rt711.c        | 17 +++++++++-
 .../intel/common/soc-acpi-intel-ehl-match.c   |  2 +-
 6 files changed, 54 insertions(+), 13 deletions(-)

base-commit: 22e9b543
--
2.25.1
parents fc926a7c 58ef6002

include/sound/soc-dai.h

+1 −0
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ void snd_soc_dai_resume(struct snd_soc_dai *dai); 
int snd_soc_dai_compress_new(struct snd_soc_dai *dai,

			     struct snd_soc_pcm_runtime *rtd, int num);

bool snd_soc_dai_stream_valid(struct snd_soc_dai *dai, int stream);

void snd_soc_dai_link_set_capabilities(struct snd_soc_dai_link *dai_link);

void snd_soc_dai_action(struct snd_soc_dai *dai,

			int stream, int action);

static inline void snd_soc_dai_activate(struct snd_soc_dai *dai,

sound/soc/codecs/max98373.c

+0 −8
Original line number Diff line number Diff line
@@ -331,13 +331,6 @@ static int max98373_probe(struct snd_soc_component *component) 
	regmap_write(max98373->regmap,

		MAX98373_R202A_PCM_TO_SPK_MONO_MIX_2,

		0x1);

	/* Set inital volume (0dB) */

	regmap_write(max98373->regmap,

		MAX98373_R203D_AMP_DIG_VOL_CTRL,

		0x00);

	regmap_write(max98373->regmap,

		MAX98373_R203E_AMP_PATH_GAIN,

		0x00);

	/* Enable DC blocker */

	regmap_write(max98373->regmap,

		MAX98373_R203F_AMP_DSP_CFG,
@@ -397,7 +390,6 @@ const struct snd_soc_component_driver soc_codec_dev_max98373 = { 
	.num_dapm_widgets	= ARRAY_SIZE(max98373_dapm_widgets),

	.dapm_routes		= max98373_audio_map,

	.num_dapm_routes	= ARRAY_SIZE(max98373_audio_map),

	.idle_bias_on		= 1,

	.use_pmdown_time	= 1,

	.endianness		= 1,

	.non_legacy_dai_naming	= 1,

sound/soc/codecs/rt286.c

+4 −4
Original line number Diff line number Diff line
@@ -272,13 +272,13 @@ static int rt286_jack_detect(struct rt286_priv *rt286, bool *hp, bool *mic) 
		regmap_read(rt286->regmap, RT286_GET_MIC1_SENSE, &buf);

		*mic = buf & 0x80000000;

	}

	if (!*mic) {



	if (!*hp) {

		snd_soc_dapm_disable_pin(dapm, "HV");

		snd_soc_dapm_disable_pin(dapm, "VREF");

	}

	if (!*hp)

		snd_soc_dapm_disable_pin(dapm, "LDO1");

		snd_soc_dapm_sync(dapm);

	}



	return 0;

}

sound/soc/codecs/rt5682.c

+19 −8
Original line number Diff line number Diff line
@@ -970,13 +970,12 @@ int rt5682_headset_detect(struct snd_soc_component *component, int jack_insert) 
		rt5682_enable_push_button_irq(component, false);

		snd_soc_component_update_bits(component, RT5682_CBJ_CTRL_1,

			RT5682_TRIG_JD_MASK, RT5682_TRIG_JD_LOW);

		if (snd_soc_dapm_get_pin_status(dapm, "MICBIAS"))

		if (!snd_soc_dapm_get_pin_status(dapm, "MICBIAS"))

			snd_soc_component_update_bits(component,

				RT5682_PWR_ANLG_1, RT5682_PWR_VREF2, 0);

		else

				RT5682_PWR_ANLG_1, RT5682_PWR_MB, 0);

		if (!snd_soc_dapm_get_pin_status(dapm, "Vref2"))

			snd_soc_component_update_bits(component,

				RT5682_PWR_ANLG_1,

				RT5682_PWR_VREF2 | RT5682_PWR_MB, 0);

				RT5682_PWR_ANLG_1, RT5682_PWR_VREF2, 0);

		snd_soc_component_update_bits(component, RT5682_PWR_ANLG_3,

			RT5682_PWR_CBJ, 0);

		snd_soc_component_update_bits(component, RT5682_MICBIAS_2,
@@ -1088,7 +1087,8 @@ void rt5682_jack_detect_handler(struct work_struct *work) 
			/* jack was out, report jack type */

			rt5682->jack_type =

				rt5682_headset_detect(rt5682->component, 1);

		} else {

		} else if ((rt5682->jack_type & SND_JACK_HEADSET) ==

			SND_JACK_HEADSET) {

			/* jack is already in, report button event */

			rt5682->jack_type = SND_JACK_HEADSET;

			btn_type = rt5682_button_detect(rt5682->component);
@@ -1614,8 +1614,7 @@ static const struct snd_soc_dapm_widget rt5682_dapm_widgets[] = { 
		0, set_filter_clk, SND_SOC_DAPM_PRE_PMU),

	SND_SOC_DAPM_SUPPLY("Vref1", RT5682_PWR_ANLG_1, RT5682_PWR_VREF1_BIT, 0,

		rt5682_set_verf, SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU),

	SND_SOC_DAPM_SUPPLY("Vref2", RT5682_PWR_ANLG_1, RT5682_PWR_VREF2_BIT, 0,

		NULL, 0),

	SND_SOC_DAPM_SUPPLY("Vref2", SND_SOC_NOPM, 0, 0, NULL, 0),

	SND_SOC_DAPM_SUPPLY("MICBIAS", SND_SOC_NOPM, 0, 0, NULL, 0),



	/* ASRC */
@@ -2505,6 +2504,15 @@ static int rt5682_wclk_prepare(struct clk_hw *hw) 
	snd_soc_dapm_force_enable_pin_unlocked(dapm, "MICBIAS");

	snd_soc_component_update_bits(component, RT5682_PWR_ANLG_1,

				RT5682_PWR_MB, RT5682_PWR_MB);



	snd_soc_dapm_force_enable_pin_unlocked(dapm, "Vref2");

	snd_soc_component_update_bits(component, RT5682_PWR_ANLG_1,

			RT5682_PWR_VREF2 | RT5682_PWR_FV2,

			RT5682_PWR_VREF2);

	usleep_range(55000, 60000);

	snd_soc_component_update_bits(component, RT5682_PWR_ANLG_1,

			RT5682_PWR_FV2, RT5682_PWR_FV2);



	snd_soc_dapm_force_enable_pin_unlocked(dapm, "I2S1");

	snd_soc_dapm_force_enable_pin_unlocked(dapm, "PLL2F");

	snd_soc_dapm_force_enable_pin_unlocked(dapm, "PLL2B");
@@ -2530,9 +2538,12 @@ static void rt5682_wclk_unprepare(struct clk_hw *hw) 
	snd_soc_dapm_mutex_lock(dapm);



	snd_soc_dapm_disable_pin_unlocked(dapm, "MICBIAS");

	snd_soc_dapm_disable_pin_unlocked(dapm, "Vref2");

	if (!rt5682->jack_type)

		snd_soc_component_update_bits(component, RT5682_PWR_ANLG_1,

				RT5682_PWR_VREF2 | RT5682_PWR_FV2 |

				RT5682_PWR_MB, 0);



	snd_soc_dapm_disable_pin_unlocked(dapm, "I2S1");

	snd_soc_dapm_disable_pin_unlocked(dapm, "PLL2F");

	snd_soc_dapm_disable_pin_unlocked(dapm, "PLL2B");

sound/soc/codecs/wm8974.c

+5 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ SOC_DAPM_SINGLE("PCM Playback Switch", WM8974_MONOMIX, 0, 1, 0), 


/* Boost mixer */

static const struct snd_kcontrol_new wm8974_boost_mixer[] = {

SOC_DAPM_SINGLE("Aux Switch", WM8974_INPPGA, 6, 1, 0),

SOC_DAPM_SINGLE("Aux Switch", WM8974_INPPGA, 6, 1, 1),

};



/* Input PGA */
@@ -474,6 +474,10 @@ static int wm8974_set_dai_fmt(struct snd_soc_dai *codec_dai, 
		iface |= 0x0008;

		break;

	case SND_SOC_DAIFMT_DSP_A:

		if ((fmt & SND_SOC_DAIFMT_INV_MASK) == SND_SOC_DAIFMT_IB_IF ||

		    (fmt & SND_SOC_DAIFMT_INV_MASK) == SND_SOC_DAIFMT_NB_IF) {

			return -EINVAL;

		}

		iface |= 0x00018;

		break;

	default: