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

ASoC: Intel: Chromebooks: remap jack pins 

Merge series from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>:

This patchset adds the missing jack pin remapping needed by upstream
UCM on Chromebooks, suggested by Jaroslav Kysela [1].

These patches were succesfully tested on GeminiLake and JasperLake
platforms, and generalized to other Chromebooks.

[1] https://mailman.alsa-project.org/pipermail/sound-open-firmware/2022-June/004468.html
parents 8b409f75 c3ce12b2

sound/soc/intel/boards/bxt_da7219_max98357a.c

+17 −4
Original line number Diff line number Diff line
@@ -186,6 +186,17 @@ static const struct snd_soc_dapm_route gemini_map[] = { 
	{"ssp2 Rx", NULL, "Capture"},

};



static struct snd_soc_jack_pin jack_pins[] = {

	{

		.pin    = "Headphone Jack",

		.mask   = SND_JACK_HEADPHONE,

	},

	{

		.pin    = "Headset Mic",

		.mask   = SND_JACK_MICROPHONE,

	},

};



static int broxton_ssp_fixup(struct snd_soc_pcm_runtime *rtd,

			struct snd_pcm_hw_params *params)

{
@@ -231,10 +242,12 @@ static int broxton_da7219_codec_init(struct snd_soc_pcm_runtime *rtd) 
	 * Headset buttons map to the google Reference headset.

	 * These can be configured by userspace.

	 */

	ret = snd_soc_card_jack_new(rtd->card, "Headset Jack",

	ret = snd_soc_card_jack_new_pins(rtd->card, "Headset Jack",

					 SND_JACK_HEADSET | SND_JACK_BTN_0 | SND_JACK_BTN_1 |

					 SND_JACK_BTN_2 | SND_JACK_BTN_3 | SND_JACK_LINEOUT,

			&broxton_headset);

					 &broxton_headset,

					 jack_pins,

					 ARRAY_SIZE(jack_pins));

	if (ret) {

		dev_err(rtd->dev, "Headset Jack creation failed: %d\n", ret);

		return ret;

sound/soc/intel/boards/cml_rt1011_rt5682.c

+18 −5
Original line number Diff line number Diff line
@@ -121,6 +121,17 @@ static const struct snd_soc_dapm_route cml_rt1011_tt_map[] = { 
	{"TR Ext Spk", NULL, "TR SPO" },

};



static struct snd_soc_jack_pin jack_pins[] = {

	{

		.pin    = "Headphone Jack",

		.mask   = SND_JACK_HEADPHONE,

	},

	{

		.pin    = "Headset Mic",

		.mask   = SND_JACK_MICROPHONE,

	},

};



static int cml_rt5682_codec_init(struct snd_soc_pcm_runtime *rtd)

{

	struct card_private *ctx = snd_soc_card_get_drvdata(rtd->card);
@@ -137,11 +148,13 @@ static int cml_rt5682_codec_init(struct snd_soc_pcm_runtime *rtd) 
	 * Headset buttons map to the google Reference headset.

	 * These can be configured by userspace.

	 */

	ret = snd_soc_card_jack_new(rtd->card, "Headset Jack",

	ret = snd_soc_card_jack_new_pins(rtd->card, "Headset Jack",

					 SND_JACK_HEADSET | SND_JACK_BTN_0 |

					 SND_JACK_BTN_1 | SND_JACK_BTN_2 |

					 SND_JACK_BTN_3,

				    &ctx->headset);

					 &ctx->headset,

					 jack_pins,

					 ARRAY_SIZE(jack_pins));

	if (ret) {

		dev_err(rtd->dev, "Headset Jack creation failed: %d\n", ret);

		return ret;

sound/soc/intel/boards/glk_rt5682_max98357a.c

+17 −4
Original line number Diff line number Diff line
@@ -78,6 +78,17 @@ static const struct snd_soc_dapm_widget geminilake_widgets[] = { 
	SND_SOC_DAPM_SPK("HDMI3", NULL),

};



static struct snd_soc_jack_pin jack_pins[] = {

	{

		.pin    = "Headphone Jack",

		.mask   = SND_JACK_HEADPHONE,

	},

	{

		.pin    = "Headset Mic",

		.mask   = SND_JACK_MICROPHONE,

	},

};



static const struct snd_soc_dapm_route geminilake_map[] = {

	/* HP jack connectors - unknown if we have jack detection */

	{ "Headphone Jack", NULL, "HPOL" },
@@ -173,10 +184,12 @@ static int geminilake_rt5682_codec_init(struct snd_soc_pcm_runtime *rtd) 
	 * Headset buttons map to the google Reference headset.

	 * These can be configured by userspace.

	 */

	ret = snd_soc_card_jack_new(rtd->card, "Headset Jack",

	ret = snd_soc_card_jack_new_pins(rtd->card, "Headset Jack",

					 SND_JACK_HEADSET | SND_JACK_BTN_0 | SND_JACK_BTN_1 |

					 SND_JACK_BTN_2 | SND_JACK_BTN_3 | SND_JACK_LINEOUT,

			&ctx->geminilake_headset);

					 &ctx->geminilake_headset,

					 jack_pins,

					 ARRAY_SIZE(jack_pins));

	if (ret) {

		dev_err(rtd->dev, "Headset Jack creation failed: %d\n", ret);

		return ret;

sound/soc/intel/boards/kbl_da7219_max98357a.c

+17 −4
Original line number Diff line number Diff line
@@ -99,6 +99,17 @@ static const struct snd_soc_dapm_widget kabylake_widgets[] = { 
			SND_SOC_DAPM_POST_PMD),

};



static struct snd_soc_jack_pin jack_pins[] = {

	{

		.pin    = "Headphone Jack",

		.mask   = SND_JACK_HEADPHONE,

	},

	{

		.pin    = "Headset Mic",

		.mask   = SND_JACK_MICROPHONE,

	},

};



static const struct snd_soc_dapm_route kabylake_map[] = {

	{ "Headphone Jack", NULL, "HPL" },

	{ "Headphone Jack", NULL, "HPR" },
@@ -179,10 +190,12 @@ static int kabylake_da7219_codec_init(struct snd_soc_pcm_runtime *rtd) 
	 * Headset buttons map to the google Reference headset.

	 * These can be configured by userspace.

	 */

	ret = snd_soc_card_jack_new(kabylake_audio_card, "Headset Jack",

	ret = snd_soc_card_jack_new_pins(kabylake_audio_card, "Headset Jack",

					 SND_JACK_HEADSET | SND_JACK_BTN_0 | SND_JACK_BTN_1 |

					 SND_JACK_BTN_2 | SND_JACK_BTN_3 | SND_JACK_LINEOUT,

			&ctx->kabylake_headset);

					 &ctx->kabylake_headset,

					 jack_pins,

					 ARRAY_SIZE(jack_pins));

	if (ret) {

		dev_err(rtd->dev, "Headset Jack creation failed: %d\n", ret);

		return ret;

sound/soc/intel/boards/kbl_da7219_max98927.c

+17 −4
Original line number Diff line number Diff line
@@ -119,6 +119,17 @@ static const struct snd_soc_dapm_widget kabylake_widgets[] = { 
			SND_SOC_DAPM_POST_PMD),

};



static struct snd_soc_jack_pin jack_pins[] = {

	{

		.pin    = "Headphone Jack",

		.mask   = SND_JACK_HEADPHONE,

	},

	{

		.pin    = "Headset Mic",

		.mask   = SND_JACK_MICROPHONE,

	},

};



static const struct snd_soc_dapm_route kabylake_map[] = {

	/* speaker */

	{ "Left Spk", NULL, "Left BE_OUT" },
@@ -354,10 +365,12 @@ static int kabylake_da7219_codec_init(struct snd_soc_pcm_runtime *rtd) 
	 * Headset buttons map to the google Reference headset.

	 * These can be configured by userspace.

	 */

	ret = snd_soc_card_jack_new(kabylake_audio_card, "Headset Jack",

	ret = snd_soc_card_jack_new_pins(kabylake_audio_card, "Headset Jack",

					 SND_JACK_HEADSET | SND_JACK_BTN_0 | SND_JACK_BTN_1 |

					 SND_JACK_BTN_2 | SND_JACK_BTN_3 | SND_JACK_LINEOUT,

			&ctx->kabylake_headset);

					 &ctx->kabylake_headset,

					 jack_pins,

					 ARRAY_SIZE(jack_pins));

	if (ret) {

		dev_err(rtd->dev, "Headset Jack creation failed: %d\n", ret);

		return ret;