[PATCH] ASoC: Intel: bytcr_rt5640: Use cfg-lineout:2 in the components string

[PATCH] ASoC: Intel: bytcr_rt5640: Use cfg-lineout:2 in the components string

[Hans de Goede]

Use "cfg-lineout:2" in the components string on boards with a lineout
instead of "cfg-lineout:1", this better mirrors the speaker part of
the components string where we use "cfg-spk:1" for devices with a single
speaker and "cfg-spk:2" for stereo speakers.

The lineout is stereo by default, so using ":2" makes more sense, this
way we keep ":1" reserved in case we ever encounter a device with
a mono lineout.

We can make this change without breaking userspace because no kernel
has shipped with "cfg-lineout:1" in the component-string yet; and there
also are no userspace bits (UCM profiles) checking for this yet.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 sound/soc/intel/boards/bytcr_rt5640.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c
index 369642c07a5d..f79234f49c7c 100644
--- a/sound/soc/intel/boards/bytcr_rt5640.c
+++ b/sound/soc/intel/boards/bytcr_rt5640.c
@@ -1688,7 +1688,7 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev)
 		if (byt_rt5640_quirk & BYT_RT5640_LINEOUT_AS_HP2)
 			lineout_string = " cfg-hp2:lineout";
 		else
-			lineout_string = " cfg-lineout:1";
+			lineout_string = " cfg-lineout:2";
 	}
 
 	if (byt_rt5640_quirk & BYT_RT5640_HSMIC2_ON_IN1)
-- 
2.31.1

Re: [PATCH] ASoC: Intel: bytcr_rt5640: Use cfg-lineout:2 in the components string

[Pierre-Louis Bossart]

On 8/16/21 6:47 AM, Hans de Goede wrote:
> Use "cfg-lineout:2" in the components string on boards with a lineout
> instead of "cfg-lineout:1", this better mirrors the speaker part of
> the components string where we use "cfg-spk:1" for devices with a single
> speaker and "cfg-spk:2" for stereo speakers.
> 
> The lineout is stereo by default, so using ":2" makes more sense, this
> way we keep ":1" reserved in case we ever encounter a device with
> a mono lineout.
> 
> We can make this change without breaking userspace because no kernel
> has shipped with "cfg-lineout:1" in the component-string yet; and there
> also are no userspace bits (UCM profiles) checking for this yet.
> 
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>

Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

> ---
>  sound/soc/intel/boards/bytcr_rt5640.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c
> index 369642c07a5d..f79234f49c7c 100644
> --- a/sound/soc/intel/boards/bytcr_rt5640.c
> +++ b/sound/soc/intel/boards/bytcr_rt5640.c
> @@ -1688,7 +1688,7 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev)
>  		if (byt_rt5640_quirk & BYT_RT5640_LINEOUT_AS_HP2)
>  			lineout_string = " cfg-hp2:lineout";
>  		else
> -			lineout_string = " cfg-lineout:1";
> +			lineout_string = " cfg-lineout:2";
>  	}
>  
>  	if (byt_rt5640_quirk & BYT_RT5640_HSMIC2_ON_IN1)
> 

Re: [PATCH] ASoC: Intel: bytcr_rt5640: Use cfg-lineout:2 in the components string

[Mark Brown]

On Mon, 16 Aug 2021 13:47:22 +0200, Hans de Goede wrote:
> Use "cfg-lineout:2" in the components string on boards with a lineout
> instead of "cfg-lineout:1", this better mirrors the speaker part of
> the components string where we use "cfg-spk:1" for devices with a single
> speaker and "cfg-spk:2" for stereo speakers.
> 
> The lineout is stereo by default, so using ":2" makes more sense, this
> way we keep ":1" reserved in case we ever encounter a device with
> a mono lineout.
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: Intel: bytcr_rt5640: Use cfg-lineout:2 in the components string
      commit: f8043ef50acaeb396702481bd2701066bac8a2bc

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark