Unverified Commit 54d796b8 authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "AsoC: rt5640/rt5651: Volume control fixes" from Hans de Goede <hdegoede@redhat.com>: 

Hi All,

Here is a resent of the remaining patches from my
"[PATCH 0/5] AsoC: rt5640/rt5651: Volume control fixes" series,
with the controversial "[PATCH 3/5] ASoC: rt5640: Add emulated
'DAC1 Playback Switch' control" patch dropped, and these
remaining 2 patches rebased to still apply with that patch dropped.

Regards,

Hans

Hans de Goede (2):
  ASoC: rt5640: Rename 'Mono DAC Playback Volume' to 'DAC2 Playback
    Volume'
  ASoC: Intel: bytcr_rt5640: Add used AIF to the components string

 sound/soc/codecs/rt5640.c             |  6 +++---
 sound/soc/intel/boards/bytcr_rt5640.c | 11 ++++++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

--
2.30.1
parents 6e35f428 9f47c9c8

sound/soc/codecs/rt5640.c

+3 −3
Original line number Diff line number Diff line
@@ -400,6 +400,9 @@ static const struct snd_kcontrol_new rt5640_snd_controls[] = { 
	/* DAC Digital Volume */

	SOC_DOUBLE("DAC2 Playback Switch", RT5640_DAC2_CTRL,

		RT5640_M_DAC_L2_VOL_SFT, RT5640_M_DAC_R2_VOL_SFT, 1, 1),

	SOC_DOUBLE_TLV("DAC2 Playback Volume", RT5640_DAC2_DIG_VOL,

			RT5640_L_VOL_SFT, RT5640_R_VOL_SFT,

			175, 0, dac_vol_tlv),

	SOC_DOUBLE_TLV("DAC1 Playback Volume", RT5640_DAC1_DIG_VOL,

			RT5640_L_VOL_SFT, RT5640_R_VOL_SFT,

			175, 0, dac_vol_tlv),
@@ -443,9 +446,6 @@ static const struct snd_kcontrol_new rt5640_specific_snd_controls[] = { 
	/* MONO Output Control */

	SOC_SINGLE("Mono Playback Switch", RT5640_MONO_OUT, RT5640_L_MUTE_SFT,

		1, 1),



	SOC_DOUBLE_TLV("Mono DAC Playback Volume", RT5640_DAC2_DIG_VOL,

		RT5640_L_VOL_SFT, RT5640_R_VOL_SFT, 175, 0, dac_vol_tlv),

};



/**

sound/soc/intel/boards/bytcr_rt5640.c

+8 −3
Original line number Diff line number Diff line
@@ -1255,6 +1255,7 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev) 
	int ret_val = 0;

	int dai_index = 0;

	int i, cfg_spk;

	int aif;



	is_bytcr = false;

	priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
@@ -1366,8 +1367,12 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev) 
	log_quirks(&pdev->dev);



	if ((byt_rt5640_quirk & BYT_RT5640_SSP2_AIF2) ||

	    (byt_rt5640_quirk & BYT_RT5640_SSP0_AIF2))

	    (byt_rt5640_quirk & BYT_RT5640_SSP0_AIF2)) {

		byt_rt5640_dais[dai_index].codecs->dai_name = "rt5640-aif2";

		aif = 2;

	} else {

		aif = 1;

	}



	if ((byt_rt5640_quirk & BYT_RT5640_SSP0_AIF1) ||

	    (byt_rt5640_quirk & BYT_RT5640_SSP0_AIF2))
@@ -1405,8 +1410,8 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev) 
	}



	snprintf(byt_rt5640_components, sizeof(byt_rt5640_components),

		 "cfg-spk:%d cfg-mic:%s", cfg_spk,

		 map_name[BYT_RT5640_MAP(byt_rt5640_quirk)]);

		 "cfg-spk:%d cfg-mic:%s aif:%d", cfg_spk,

		 map_name[BYT_RT5640_MAP(byt_rt5640_quirk)], aif);

	byt_rt5640_card.components = byt_rt5640_components;

#if !IS_ENABLED(CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES)

	snprintf(byt_rt5640_long_name, sizeof(byt_rt5640_long_name),