Unverified Commit 6490bec6 authored May 06, 2024 by Amadeusz Sławiński Committed by Mark Brown May 06, 2024

ASoC: Intel: avs: boards: Properly name input device

Machine boards expose input device for use with userspace. Current name
in some cases is incorrect, fix it.

Reviewed-by: Cezary Rojewski <cezary.rojewski@intel.com>
Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Link: https://lore.kernel.org/r/20240506121106.3792340-1-amadeuszx.slawinski@linux.intel.com

Signed-off-by: Mark Brown <broonie@kernel.org>

parent 09068d62

sound/soc/intel/avs/boards/es8336.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -113,7 +113,7 @@ static int avs_es8336_codec_init(struct snd_soc_pcm_runtime *runtime)
		if (!pins)
		return -ENOMEM;

		ret = snd_soc_card_jack_new_pins(card, "Headset", SND_JACK_HEADSET \| SND_JACK_BTN_0,
		ret = snd_soc_card_jack_new_pins(card, "Headset Jack", SND_JACK_HEADSET \| SND_JACK_BTN_0,
		&data->jack, pins, num_pins);
		if (ret)
		return ret;

sound/soc/intel/avs/boards/nau8825.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -96,7 +96,7 @@ static int avs_nau8825_codec_init(struct snd_soc_pcm_runtime *runtime)
		* 4 buttons here map to the google Reference headset.
		* The use of these buttons can be decided by the user space.
		*/
		ret = snd_soc_card_jack_new_pins(card, "Headset", SND_JACK_HEADSET \| SND_JACK_BTN_0 \|
		ret = snd_soc_card_jack_new_pins(card, "Headset Jack", SND_JACK_HEADSET \| SND_JACK_BTN_0 \|
		SND_JACK_BTN_1 \| SND_JACK_BTN_2 \| SND_JACK_BTN_3,
		jack, pins, num_pins);
		if (ret)

sound/soc/intel/avs/boards/rt274.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -102,7 +102,8 @@ static int avs_rt274_codec_init(struct snd_soc_pcm_runtime *runtime)
		if (!pins)
		return -ENOMEM;

		ret = snd_soc_card_jack_new_pins(card, "Headset", SND_JACK_HEADSET, jack, pins, num_pins);
		ret = snd_soc_card_jack_new_pins(card, "Headset Jack", SND_JACK_HEADSET, jack, pins,
		num_pins);
		if (ret)
		return ret;

sound/soc/intel/avs/boards/rt286.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -63,8 +63,8 @@ static int avs_rt286_codec_init(struct snd_soc_pcm_runtime *runtime)
		if (!pins)
		return -ENOMEM;

		ret = snd_soc_card_jack_new_pins(card, "Headset", SND_JACK_HEADSET \| SND_JACK_BTN_0, jack,
		pins, num_pins);
		ret = snd_soc_card_jack_new_pins(card, "Headset Jack", SND_JACK_HEADSET \| SND_JACK_BTN_0,
		jack, pins, num_pins);
		if (ret)
		return ret;

sound/soc/intel/avs/boards/rt298.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -74,8 +74,8 @@ static int avs_rt298_codec_init(struct snd_soc_pcm_runtime *runtime)
		if (!pins)
		return -ENOMEM;

		ret = snd_soc_card_jack_new_pins(card, "Headset", SND_JACK_HEADSET \| SND_JACK_BTN_0, jack,
		pins, num_pins);
		ret = snd_soc_card_jack_new_pins(card, "Headset Jack", SND_JACK_HEADSET \| SND_JACK_BTN_0,
		jack, pins, num_pins);
		if (ret)
		return ret;