Unverified Commit 798313f2 authored by Naveen Manohar's avatar Naveen Manohar Committed by Mark Brown
Browse files

ASoC: Intel: sof_sdw: Add Volteer support with RT5682 SNDW helper function 



Add support for Google Volteer device. As per new unified soundwire machine
driver, add rt5682-sdw helper function, which configures codec to Link0.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarNaveen Manohar <naveen.m@intel.com>
Link: https://lore.kernel.org/r/20200325220746.29601-5-pierre-louis.bossart@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 095ee719

sound/soc/intel/boards/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -538,6 +538,7 @@ config SND_SOC_INTEL_SOUNDWIRE_SOF_MACH 
	select SND_SOC_RT1308_SDW

	select SND_SOC_RT1308

	select SND_SOC_RT715_SDW

	select SND_SOC_RT5682_SDW

	select SND_SOC_DMIC

        help

	  Add support for Intel SoundWire-based platforms connected to

sound/soc/intel/boards/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ snd-soc-sof_da7219_max98373-objs := sof_da7219_max98373.o hda_dsp_common.o 
snd-soc-sof-sdw-objs += sof_sdw.o				\

			sof_sdw_rt711.o sof_sdw_rt700.o		\

			sof_sdw_rt1308.o sof_sdw_rt715.o	\

			sof_sdw_rt5682.o			\

			sof_sdw_dmic.o sof_sdw_hdmi.o hda_dsp_common.o

obj-$(CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH) += snd-soc-sof_rt5682.o

obj-$(CONFIG_SND_SOC_INTEL_HASWELL_MACH) += snd-soc-sst-haswell.o

sound/soc/intel/boards/sof_sdw.c

+18 −0
Original line number Diff line number Diff line
@@ -91,6 +91,14 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { 
		},

		.driver_data = (void *)SOF_SDW_PCH_DMIC,

	},

	{

		.callback = sof_sdw_quirk_cb,

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Google"),

			DMI_MATCH(DMI_PRODUCT_NAME, "Volteer"),

		},

		.driver_data = (void *)(SOF_SDW_TGL_HDMI | SOF_SDW_PCH_DMIC),

	},



	{}

};
@@ -128,6 +136,10 @@ static struct snd_soc_codec_conf codec_conf[] = { 
		.dlc = COMP_CODEC_CONF("sdw:3:25d:715:0"),

		.name_prefix = "rt715",

	},

	{

		.dlc = COMP_CODEC_CONF("sdw:0:25d:5682:0"),

		.name_prefix = "rt5682",

	},

};



static struct snd_soc_dai_link_component dmic_component[] = {
@@ -187,6 +199,12 @@ static struct sof_sdw_codec_info codec_info_list[] = { 
		.dai_name = "rt715-aif2",

		.init = sof_sdw_rt715_init,

	},

	{

		.id = 0x5682,

		.direction = {true, true},

		.dai_name = "rt5682-sdw",

		.init = sof_sdw_rt5682_init,

	},

};



static inline int find_codec_info_part(unsigned int part_id)

sound/soc/intel/boards/sof_sdw_common.h

+6 −0
Original line number Diff line number Diff line
@@ -105,4 +105,10 @@ int sof_sdw_rt715_init(const struct snd_soc_acpi_link_adr *link, 
		       struct sof_sdw_codec_info *info,

		       bool playback);



/* RT5682 support */

int sof_sdw_rt5682_init(const struct snd_soc_acpi_link_adr *link,

			struct snd_soc_dai_link *dai_links,

			struct sof_sdw_codec_info *info,

			bool playback);



#endif

sound/soc/intel/boards/sof_sdw_rt5682.c

0 → 100644
+126 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

// Copyright (c) 2020 Intel Corporation



/*

 *  sof_sdw_rt5682 - Helpers to handle RT5682 from generic machine driver

 */



#include <linux/device.h>

#include <linux/errno.h>

#include <linux/input.h>

#include <linux/soundwire/sdw.h>

#include <linux/soundwire/sdw_type.h>

#include <sound/soc.h>

#include <sound/soc-acpi.h>

#include <sound/jack.h>

#include "sof_sdw_common.h"



static const struct snd_soc_dapm_widget rt5682_widgets[] = {

	SND_SOC_DAPM_HP("Headphone", NULL),

	SND_SOC_DAPM_MIC("Headset Mic", NULL),

};



static const struct snd_soc_dapm_route rt5682_map[] = {

	/*Headphones*/

	{ "Headphone", NULL, "rt5682 HPOL" },

	{ "Headphone", NULL, "rt5682 HPOR" },

	{ "rt5682 IN1P", NULL, "Headset Mic" },

};



static const struct snd_kcontrol_new rt5682_controls[] = {

	SOC_DAPM_PIN_SWITCH("Headphone"),

	SOC_DAPM_PIN_SWITCH("Headset Mic"),

};



static struct snd_soc_jack_pin rt5682_jack_pins[] = {

	{

		.pin    = "Headphone",

		.mask   = SND_JACK_HEADPHONE,

	},

	{

		.pin    = "Headset Mic",

		.mask   = SND_JACK_MICROPHONE,

	},

};



static int rt5682_rtd_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_card *card = rtd->card;

	struct mc_private *ctx = snd_soc_card_get_drvdata(card);

	struct snd_soc_component *component = rtd->codec_dai->component;

	struct snd_soc_jack *jack;

	int ret;



	card->components = devm_kasprintf(card->dev, GFP_KERNEL,

					  "%s hs:rt5682",

					  card->components);

	if (!card->components)

		return -ENOMEM;



	ret = snd_soc_add_card_controls(card, rt5682_controls,

					ARRAY_SIZE(rt5682_controls));

	if (ret) {

		dev_err(card->dev, "rt5682 control addition failed: %d\n", ret);

		return ret;

	}



	ret = snd_soc_dapm_new_controls(&card->dapm, rt5682_widgets,

					ARRAY_SIZE(rt5682_widgets));

	if (ret) {

		dev_err(card->dev, "rt5682 widgets addition failed: %d\n", ret);

		return ret;

	}



	ret = snd_soc_dapm_add_routes(&card->dapm, rt5682_map,

				      ARRAY_SIZE(rt5682_map));



	if (ret) {

		dev_err(card->dev, "rt5682 map addition failed: %d\n", ret);

		return ret;

	}



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

				    SND_JACK_HEADSET | SND_JACK_BTN_0 |

				    SND_JACK_BTN_1 | SND_JACK_BTN_2 |

				    SND_JACK_BTN_3,

				    &ctx->sdw_headset,

				    rt5682_jack_pins,

				    ARRAY_SIZE(rt5682_jack_pins));

	if (ret) {

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

			ret);

		return ret;

	}



	jack = &ctx->sdw_headset;



	snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_PLAYPAUSE);

	snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOICECOMMAND);

	snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP);

	snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN);



	ret = snd_soc_component_set_jack(component, jack, NULL);



	if (ret)

		dev_err(rtd->card->dev, "Headset Jack call-back failed: %d\n",

			ret);



	return ret;

}



int sof_sdw_rt5682_init(const struct snd_soc_acpi_link_adr *link,

			struct snd_soc_dai_link *dai_links,

			struct sof_sdw_codec_info *info,

			bool playback)

{

	/*

	 * headset should be initialized once.

	 * Do it with dai link for playback.

	 */

	if (!playback)

		return 0;



	dai_links->init = rt5682_rtd_init;



	return 0;

}