Unverified Commit 09225b43 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Intel: avs: New boards and fixes to existing 

Merge series from Cezary Rojewski <cezary.rojewski@intel.com>:

Series adds support for two boards: es8336 and rt5663. The former is
utilized by some KBL-based tablets whereas the latter unlocks
Chromebooks with rt5663 i2c codecs.

As existing implementation of es8336 (es8316.c) codec driver is not
prepared to cope with KBL-based platforms, couple of small,
clock-related changes precede anything avs-driver related.

The tail of patchset cleans up existing implementation of rt5682.
parents 441511ae 7012fa7d

sound/soc/codecs/es8316.c

+3 −2
Original line number Diff line number Diff line
@@ -27,9 +27,9 @@ 
 * MCLK/LRCK ratios, but we also add ratio 400, which is commonly used on

 * Intel Cherry Trail platforms (19.2MHz MCLK, 48kHz LRCK).

 */

#define NR_SUPPORTED_MCLK_LRCK_RATIOS 6

#define NR_SUPPORTED_MCLK_LRCK_RATIOS ARRAY_SIZE(supported_mclk_lrck_ratios)

static const unsigned int supported_mclk_lrck_ratios[] = {

	256, 384, 400, 512, 768, 1024

	256, 384, 400, 500, 512, 768, 1024

};



struct es8316_priv {
@@ -494,6 +494,7 @@ static int es8316_pcm_hw_params(struct snd_pcm_substream *substream, 
		bclk_divider /= 20;

		break;

	case SNDRV_PCM_FORMAT_S24_LE:

	case SNDRV_PCM_FORMAT_S24_3LE:

		wordlen = ES8316_SERDATA2_LEN_24;

		bclk_divider /= 24;

		break;

sound/soc/intel/avs/board_selection.c

+16 −0
Original line number Diff line number Diff line
@@ -135,6 +135,14 @@ static struct snd_soc_acpi_mach avs_kbl_i2s_machines[] = { 
		},

		.tplg_filename = "max98927-tplg.bin",

	},

	{

		.id = "10EC5663",

		.drv_name = "avs_rt5663",

		.mach_params = {

			.i2s_link_mask = AVS_SSP(1),

		},

		.tplg_filename = "rt5663-tplg.bin",

	},

	{

		.id = "MX98373",

		.drv_name = "avs_max98373",
@@ -159,6 +167,14 @@ static struct snd_soc_acpi_mach avs_kbl_i2s_machines[] = { 
		},

		.tplg_filename = "da7219-tplg.bin",

	},

	{

		.id = "ESSX8336",

		.drv_name = "avs_es8336",

		.mach_params = {

			.i2s_link_mask = AVS_SSP(0),

		},

		.tplg_filename = "es8336-tplg.bin",

	},

	{},

};

sound/soc/intel/avs/boards/Kconfig

+20 −0
Original line number Diff line number Diff line
@@ -22,6 +22,16 @@ config SND_SOC_INTEL_AVS_MACH_DMIC 
	  Say Y or m if you have such a device. This is a recommended option.

	  If unsure select "N".



config SND_SOC_INTEL_AVS_MACH_ES8336

	tristate "es8336 I2S board"

	depends on X86 && I2C

	depends on MFD_INTEL_LPSS || COMPILE_TEST

	select SND_SOC_ES8316

	help

	  This adds support for AVS with ES8336 I2S codec configuration.

	  Say Y or m if you have such a device. This is a recommended option.

	  If unsure select "N".



config SND_SOC_INTEL_AVS_MACH_HDAUDIO

	tristate "HD-Audio generic board"

	select SND_SOC_HDA
@@ -115,6 +125,16 @@ config SND_SOC_INTEL_AVS_MACH_RT298 
	   Say Y or m if you have such a device. This is a recommended option.

	   If unsure select "N".



config SND_SOC_INTEL_AVS_MACH_RT5663

	tristate "rt5663 in I2S mode"

	depends on I2C

	depends on MFD_INTEL_LPSS || COMPILE_TEST

	select SND_SOC_RT5663

	help

	   This adds support for ASoC machine driver with RT5663 I2S audio codec.

	   Say Y or m if you have such a device. This is a recommended option.

	   If unsure select "N".



config SND_SOC_INTEL_AVS_MACH_RT5682

	tristate "rt5682 in I2S mode"

	depends on I2C

sound/soc/intel/avs/boards/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


snd-soc-avs-da7219-objs := da7219.o

snd-soc-avs-dmic-objs := dmic.o

snd-soc-avs-es8336-objs := es8336.o

snd-soc-avs-hdaudio-objs := hdaudio.o

snd-soc-avs-i2s-test-objs := i2s_test.o

snd-soc-avs-max98927-objs := max98927.o
@@ -12,11 +13,13 @@ snd-soc-avs-probe-objs := probe.o 
snd-soc-avs-rt274-objs := rt274.o

snd-soc-avs-rt286-objs := rt286.o

snd-soc-avs-rt298-objs := rt298.o

snd-soc-avs-rt5663-objs := rt5663.o

snd-soc-avs-rt5682-objs := rt5682.o

snd-soc-avs-ssm4567-objs := ssm4567.o



obj-$(CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219) += snd-soc-avs-da7219.o

obj-$(CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC) += snd-soc-avs-dmic.o

obj-$(CONFIG_SND_SOC_INTEL_AVS_MACH_ES8336) += snd-soc-avs-es8336.o

obj-$(CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO) += snd-soc-avs-hdaudio.o

obj-$(CONFIG_SND_SOC_INTEL_AVS_MACH_I2S_TEST) += snd-soc-avs-i2s-test.o

obj-$(CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98927) += snd-soc-avs-max98927.o
@@ -27,5 +30,6 @@ obj-$(CONFIG_SND_SOC_INTEL_AVS_MACH_PROBE) += snd-soc-avs-probe.o 
obj-$(CONFIG_SND_SOC_INTEL_AVS_MACH_RT274) += snd-soc-avs-rt274.o

obj-$(CONFIG_SND_SOC_INTEL_AVS_MACH_RT286) += snd-soc-avs-rt286.o

obj-$(CONFIG_SND_SOC_INTEL_AVS_MACH_RT298) += snd-soc-avs-rt298.o

obj-$(CONFIG_SND_SOC_INTEL_AVS_MACH_RT5663) += snd-soc-avs-rt5663.o

obj-$(CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682) += snd-soc-avs-rt5682.o

obj-$(CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567) += snd-soc-avs-ssm4567.o

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

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

//

// Copyright(c) 2023 Intel Corporation. All rights reserved.

//

// Authors: Cezary Rojewski <cezary.rojewski@intel.com>

//          Amadeusz Slawinski <amadeuszx.slawinski@linux.intel.com>

//



#include <linux/device.h>

#include <linux/gpio/consumer.h>

#include <linux/input.h>

#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/processor.h>

#include <linux/slab.h>

#include <sound/jack.h>

#include <sound/pcm.h>

#include <sound/pcm_params.h>

#include <sound/soc.h>

#include <sound/soc-acpi.h>

#include <asm/intel-family.h>



#define ES8336_CODEC_DAI	"ES8316 HiFi"



struct avs_card_drvdata {

	struct snd_soc_jack jack;

	struct gpio_desc *gpiod;

};



static const struct acpi_gpio_params enable_gpio = { 0, 0, true };



static const struct acpi_gpio_mapping speaker_gpios[] = {

	{ "speaker-enable-gpios", &enable_gpio, 1, ACPI_GPIO_QUIRK_ONLY_GPIOIO },

	{ }

};



static int avs_es8336_speaker_power_event(struct snd_soc_dapm_widget *w,

					  struct snd_kcontrol *kcontrol, int event)

{

	struct snd_soc_card *card = w->dapm->card;

	struct avs_card_drvdata *data;

	bool speaker_en;



	data = snd_soc_card_get_drvdata(card);

	/* As enable_gpio has active_low=true, logic is inverted. */

	speaker_en = !SND_SOC_DAPM_EVENT_ON(event);



	gpiod_set_value_cansleep(data->gpiod, speaker_en);

	return 0;

}



static const struct snd_soc_dapm_widget card_widgets[] = {

	SND_SOC_DAPM_SPK("Speaker", NULL),

	SND_SOC_DAPM_HP("Headphone", NULL),

	SND_SOC_DAPM_MIC("Headset Mic", NULL),

	SND_SOC_DAPM_MIC("Internal Mic", NULL),



	SND_SOC_DAPM_SUPPLY("Speaker Power", SND_SOC_NOPM, 0, 0,

			    avs_es8336_speaker_power_event,

			    SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),

};



static const struct snd_soc_dapm_route card_routes[] = {

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

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



	/*

	 * There is no separate speaker output instead the speakers are muxed to

	 * the HP outputs. The mux is controlled by the "Speaker Power" widget.

	 */

	{"Speaker", NULL, "HPOL"},

	{"Speaker", NULL, "HPOR"},

	{"Speaker", NULL, "Speaker Power"},



	/* Mic route map */

	{"MIC1", NULL, "Internal Mic"},

	{"MIC2", NULL, "Headset Mic"},

};



static const struct snd_kcontrol_new card_controls[] = {

	SOC_DAPM_PIN_SWITCH("Speaker"),

	SOC_DAPM_PIN_SWITCH("Headphone"),

	SOC_DAPM_PIN_SWITCH("Headset Mic"),

	SOC_DAPM_PIN_SWITCH("Internal Mic"),

};



static struct snd_soc_jack_pin card_headset_pins[] = {

	{

		.pin = "Headphone",

		.mask = SND_JACK_HEADPHONE,

	},

	{

		.pin = "Headset Mic",

		.mask = SND_JACK_MICROPHONE,

	},

};



static int avs_es8336_codec_init(struct snd_soc_pcm_runtime *runtime)

{

	struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(runtime, 0);

	struct snd_soc_component *component = codec_dai->component;

	struct snd_soc_card *card = runtime->card;

	struct snd_soc_jack_pin *pins;

	struct avs_card_drvdata *data;

	struct gpio_desc *gpiod;

	int num_pins, ret;



	data = snd_soc_card_get_drvdata(card);

	num_pins = ARRAY_SIZE(card_headset_pins);



	pins = devm_kmemdup(card->dev, card_headset_pins, sizeof(*pins) * num_pins, GFP_KERNEL);

	if (!pins)

		return -ENOMEM;



	ret = snd_soc_card_jack_new_pins(card, "Headset", SND_JACK_HEADSET | SND_JACK_BTN_0,

					 &data->jack, pins, num_pins);

	if (ret)

		return ret;



	ret = devm_acpi_dev_add_driver_gpios(codec_dai->dev, speaker_gpios);

	if (ret)

		dev_warn(codec_dai->dev, "Unable to add GPIO mapping table\n");



	gpiod = gpiod_get_optional(codec_dai->dev, "speaker-enable", GPIOD_OUT_LOW);

	if (IS_ERR(gpiod))

		return dev_err_probe(codec_dai->dev, PTR_ERR(gpiod), "Get gpiod failed: %ld\n",

				     PTR_ERR(gpiod));



	data->gpiod = gpiod;

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

	snd_soc_component_set_jack(component, &data->jack, NULL);



	card->dapm.idle_bias_off = true;



	return 0;

}



static void avs_es8336_codec_exit(struct snd_soc_pcm_runtime *runtime)

{

	struct avs_card_drvdata *data = snd_soc_card_get_drvdata(runtime->card);

	struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(runtime, 0);



	snd_soc_component_set_jack(codec_dai->component, NULL, NULL);

	gpiod_put(data->gpiod);

}



static int avs_es8336_hw_params(struct snd_pcm_substream *substream,

				struct snd_pcm_hw_params *params)

{

	struct snd_soc_pcm_runtime *runtime = asoc_substream_to_rtd(substream);

	struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(runtime, 0);

	int clk_freq;

	int ret;



	switch (boot_cpu_data.x86_model) {

	case INTEL_FAM6_KABYLAKE_L:

	case INTEL_FAM6_KABYLAKE:

		clk_freq = 24000000;

		break;

	default:

		clk_freq = 19200000;

		break;

	}



	ret = snd_soc_dai_set_sysclk(codec_dai, 1, clk_freq, SND_SOC_CLOCK_OUT);

	if (ret < 0)

		dev_err(runtime->dev, "Set codec sysclk failed: %d\n", ret);



	return ret;

}



static const struct snd_soc_ops avs_es8336_ops = {

	.hw_params = avs_es8336_hw_params,

};



static int avs_es8336_be_fixup(struct snd_soc_pcm_runtime *runtime,

			       struct snd_pcm_hw_params *params)

{

	struct snd_interval *rate, *channels;

	struct snd_mask *fmt;



	rate = hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE);

	channels = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS);

	fmt = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);



	/* The ADSP will convert the FE rate to 48k, stereo */

	rate->min = rate->max = 48000;

	channels->min = channels->max = 2;



	/* set SSPN to 24 bit */

	snd_mask_none(fmt);

	snd_mask_set_format(fmt, SNDRV_PCM_FORMAT_S24_3LE);



	return 0;

}

static int avs_create_dai_link(struct device *dev, const char *platform_name, int ssp_port,

			       struct snd_soc_dai_link **dai_link)

{

	struct snd_soc_dai_link_component *platform;

	struct snd_soc_dai_link *dl;



	dl = devm_kzalloc(dev, sizeof(*dl), GFP_KERNEL);

	platform = devm_kzalloc(dev, sizeof(*platform), GFP_KERNEL);

	if (!dl || !platform)

		return -ENOMEM;



	platform->name = platform_name;



	dl->name = devm_kasprintf(dev, GFP_KERNEL, "SSP%d-Codec", ssp_port);

	dl->cpus = devm_kzalloc(dev, sizeof(*dl->cpus), GFP_KERNEL);

	dl->codecs = devm_kzalloc(dev, sizeof(*dl->codecs), GFP_KERNEL);

	if (!dl->name || !dl->cpus || !dl->codecs)

		return -ENOMEM;



	dl->cpus->dai_name = devm_kasprintf(dev, GFP_KERNEL, "SSP%d Pin", ssp_port);

	dl->codecs->name = devm_kasprintf(dev, GFP_KERNEL, "i2c-ESSX8336:00");

	dl->codecs->dai_name = devm_kasprintf(dev, GFP_KERNEL, ES8336_CODEC_DAI);

	if (!dl->cpus->dai_name || !dl->codecs->name || !dl->codecs->dai_name)

		return -ENOMEM;



	dl->num_cpus = 1;

	dl->num_codecs = 1;

	dl->platforms = platform;

	dl->num_platforms = 1;

	dl->id = 0;

	dl->dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC;

	dl->init = avs_es8336_codec_init;

	dl->exit = avs_es8336_codec_exit;

	dl->be_hw_params_fixup = avs_es8336_be_fixup;

	dl->ops = &avs_es8336_ops;

	dl->nonatomic = 1;

	dl->no_pcm = 1;

	dl->dpcm_capture = 1;

	dl->dpcm_playback = 1;



	*dai_link = dl;



	return 0;

}



static int avs_card_suspend_pre(struct snd_soc_card *card)

{

	struct snd_soc_dai *codec_dai = snd_soc_card_get_codec_dai(card, ES8336_CODEC_DAI);



	return snd_soc_component_set_jack(codec_dai->component, NULL, NULL);

}



static int avs_card_resume_post(struct snd_soc_card *card)

{

	struct snd_soc_dai *codec_dai = snd_soc_card_get_codec_dai(card, ES8336_CODEC_DAI);

	struct avs_card_drvdata *data = snd_soc_card_get_drvdata(card);



	return snd_soc_component_set_jack(codec_dai->component, &data->jack, NULL);

}



static int avs_es8336_probe(struct platform_device *pdev)

{

	struct snd_soc_dai_link *dai_link;

	struct snd_soc_acpi_mach *mach;

	struct avs_card_drvdata *data;

	struct snd_soc_card *card;

	struct device *dev = &pdev->dev;

	const char *pname;

	int ssp_port, ret;



	mach = dev_get_platdata(dev);

	pname = mach->mach_params.platform;

	ssp_port = __ffs(mach->mach_params.i2s_link_mask);



	ret = avs_create_dai_link(dev, pname, ssp_port, &dai_link);

	if (ret) {

		dev_err(dev, "Failed to create dai link: %d", ret);

		return ret;

	}



	data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);

	card = devm_kzalloc(dev, sizeof(*card), GFP_KERNEL);

	if (!data || !card)

		return -ENOMEM;



	card->name = "avs_es8336";

	card->dev = dev;

	card->owner = THIS_MODULE;

	card->suspend_pre = avs_card_suspend_pre;

	card->resume_post = avs_card_resume_post;

	card->dai_link = dai_link;

	card->num_links = 1;

	card->controls = card_controls;

	card->num_controls = ARRAY_SIZE(card_controls);

	card->dapm_widgets = card_widgets;

	card->num_dapm_widgets = ARRAY_SIZE(card_widgets);

	card->dapm_routes = card_routes;

	card->num_dapm_routes = ARRAY_SIZE(card_routes);

	card->fully_routed = true;

	snd_soc_card_set_drvdata(card, data);



	ret = snd_soc_fixup_dai_links_platform_name(card, pname);

	if (ret)

		return ret;



	return devm_snd_soc_register_card(dev, card);

}



static struct platform_driver avs_es8336_driver = {

	.probe = avs_es8336_probe,

	.driver = {

		.name = "avs_es8336",

		.pm = &snd_soc_pm_ops,

	},

};



module_platform_driver(avs_es8336_driver);



MODULE_LICENSE("GPL");

MODULE_ALIAS("platform:avs_es8336");