Unverified Commit e2e404a6 authored by Sathyanarayana Nujella's avatar Sathyanarayana Nujella Committed by Mark Brown
Browse files

ASoC: Intel: sof_rt5682: Add support for tgl-max98373-rt5682 



This patch does the below:
1. Adds the driver data and updates quirk info for TGL
        with Max98373 speaker amp and ALC5682 headset codec.
2. Added max98373 speaker related code to common file for re-use.

Signed-off-by: default avatarJairaj Arava <jairaj.arava@intel.com>
Signed-off-by: default avatarSathyanarayana Nujella <sathyanarayana.nujella@intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20200325213245.28247-4-pierre-louis.bossart@linux.intel.com


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

sound/soc/intel/boards/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -450,6 +450,7 @@ config SND_SOC_INTEL_SOF_RT5682_MACH 
	depends on (SND_SOC_SOF_HDA_LINK && (MFD_INTEL_LPSS || COMPILE_TEST)) ||\

		   (SND_SOC_SOF_BAYTRAIL && (X86_INTEL_LPSS || COMPILE_TEST))

	depends on SND_HDA_CODEC_HDMI

	select SND_SOC_MAX98373

	select SND_SOC_RT1015

	select SND_SOC_RT5682

	select SND_SOC_DMIC

sound/soc/intel/boards/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ snd-soc-sst-byt-cht-cx2072x-objs := bytcht_cx2072x.o 
snd-soc-sst-byt-cht-da7213-objs := bytcht_da7213.o

snd-soc-sst-byt-cht-es8316-objs := bytcht_es8316.o

snd-soc-sst-byt-cht-nocodec-objs := bytcht_nocodec.o

snd-soc-sof_rt5682-objs := sof_rt5682.o hda_dsp_common.o

snd-soc-sof_rt5682-objs := sof_rt5682.o hda_dsp_common.o sof_maxim_common.o

snd-soc-cml_rt1011_rt5682-objs := cml_rt1011_rt5682.o hda_dsp_common.o

snd-soc-kbl_da7219_max98357a-objs := kbl_da7219_max98357a.o

snd-soc-kbl_da7219_max98927-objs := kbl_da7219_max98927.o

sound/soc/intel/boards/sof_maxim_common.c

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

//

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

#include <linux/string.h>

#include <sound/pcm.h>

#include <sound/soc.h>

#include <sound/soc-dai.h>

#include <sound/soc-dapm.h>

#include <uapi/sound/asound.h>

#include "sof_maxim_common.h"



static const struct snd_soc_dapm_route max_98373_dapm_routes[] = {

	/* speaker */

	{ "Left Spk", NULL, "Left BE_OUT" },

	{ "Right Spk", NULL, "Right BE_OUT" },

};



static struct snd_soc_codec_conf max_98373_codec_conf[] = {

	{

		.dlc = COMP_CODEC_CONF(MAX_98373_DEV0_NAME),

		.name_prefix = "Right",

	},

	{

		.dlc = COMP_CODEC_CONF(MAX_98373_DEV1_NAME),

		.name_prefix = "Left",

	},

};



struct snd_soc_dai_link_component max_98373_components[] = {

	{  /* For Left */

		.name = MAX_98373_DEV0_NAME,

		.dai_name = MAX_98373_CODEC_DAI,

	},

	{  /* For Right */

		.name = MAX_98373_DEV1_NAME,

		.dai_name = MAX_98373_CODEC_DAI,

	},

};



static int max98373_hw_params(struct snd_pcm_substream *substream,

			      struct snd_pcm_hw_params *params)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_dai *codec_dai;

	int j;



	for_each_rtd_codec_dais(rtd, j, codec_dai) {

		if (!strcmp(codec_dai->component->name, MAX_98373_DEV0_NAME)) {

			/* DEV0 tdm slot configuration */

			snd_soc_dai_set_tdm_slot(codec_dai, 0x30, 3, 8, 16);

		}

		if (!strcmp(codec_dai->component->name, MAX_98373_DEV1_NAME)) {

			/* DEV1 tdm slot configuration */

			snd_soc_dai_set_tdm_slot(codec_dai, 0xC0, 3, 8, 16);

		}

	}

	return 0;

}



struct snd_soc_ops max_98373_ops = {

	.hw_params = max98373_hw_params,

};



int max98373_spk_codec_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_card *card = rtd->card;

	int ret;



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

				      ARRAY_SIZE(max_98373_dapm_routes));

	if (ret)

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

	return ret;

}



void sof_max98373_codec_conf(struct snd_soc_card *card)

{

	card->codec_conf = max_98373_codec_conf;

	card->num_configs = ARRAY_SIZE(max_98373_codec_conf);

}

sound/soc/intel/boards/sof_maxim_common.h

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

/*

 * Copyright(c) 2020 Intel Corporation.

 */



/*

 * This file defines data structures used in Machine Driver for Intel

 * platforms with Maxim Codecs.

 */

#ifndef __SOF_MAXIM_COMMON_H

#define __SOF_MAXIM_COMMON_H



#include <sound/soc.h>



#define MAX_98373_CODEC_DAI	"max98373-aif1"

#define MAX_98373_DEV0_NAME	"i2c-MX98373:00"

#define MAX_98373_DEV1_NAME	"i2c-MX98373:01"



extern struct snd_soc_dai_link_component max_98373_components[2];

extern struct snd_soc_ops max_98373_ops;



int max98373_spk_codec_init(struct snd_soc_pcm_runtime *rtd);

void sof_max98373_codec_conf(struct snd_soc_card *card);

#endif /* __SOF_MAXIM_COMMON_H */

sound/soc/intel/boards/sof_rt5682.c

+21 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include "../../codecs/hdac_hdmi.h"

#include "../common/soc-intel-quirks.h"

#include "hda_dsp_common.h"

#include "sof_maxim_common.h"



#define NAME_SIZE 32
@@ -41,6 +42,7 @@ 
#define SOF_RT5682_NUM_HDMIDEV(quirk)	\

	((quirk << SOF_RT5682_NUM_HDMIDEV_SHIFT) & SOF_RT5682_NUM_HDMIDEV_MASK)

#define SOF_RT1015_SPEAKER_AMP_PRESENT		BIT(13)

#define SOF_MAX98373_SPEAKER_AMP_PRESENT	BIT(14)



/* Default: MCLK on, MCLK 19.2M, SSP0  */

static unsigned long sof_rt5682_quirk = SOF_RT5682_MCLK_EN |
@@ -637,6 +639,12 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, 
			links[id].num_codecs = ARRAY_SIZE(rt1015_components);

			links[id].init = speaker_codec_init_lr;

			links[id].ops = &sof_rt1015_ops;

		} else if (sof_rt5682_quirk &

				SOF_MAX98373_SPEAKER_AMP_PRESENT) {

			links[id].codecs = max_98373_components;

			links[id].num_codecs = ARRAY_SIZE(max_98373_components);

			links[id].init = max98373_spk_codec_init;

			links[id].ops = &max_98373_ops;

		} else {

			links[id].codecs = max98357a_component;

			links[id].num_codecs = ARRAY_SIZE(max98357a_component);
@@ -745,6 +753,9 @@ static int sof_audio_probe(struct platform_device *pdev) 
	if (sof_rt5682_quirk & SOF_SPEAKER_AMP_PRESENT)

		sof_audio_card_rt5682.num_links++;



	if (sof_rt5682_quirk & SOF_MAX98373_SPEAKER_AMP_PRESENT)

		sof_max98373_codec_conf(&sof_audio_card_rt5682);



	dai_links = sof_card_dai_links_create(&pdev->dev, ssp_codec, ssp_amp,

					      dmic_be_num, hdmi_num);

	if (!dai_links)
@@ -811,6 +822,15 @@ static const struct platform_device_id board_ids[] = { 
					SOF_RT1015_SPEAKER_AMP_PRESENT |

					SOF_RT5682_SSP_AMP(1)),

	},

	{

		.name = "tgl_max98373_rt5682",

		.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |

					SOF_RT5682_SSP_CODEC(0) |

					SOF_SPEAKER_AMP_PRESENT |

					SOF_MAX98373_SPEAKER_AMP_PRESENT |

					SOF_RT5682_SSP_AMP(1) |

					SOF_RT5682_NUM_HDMIDEV(4)),

	},

	{ }

};
@@ -833,3 +853,4 @@ MODULE_LICENSE("GPL v2"); 
MODULE_ALIAS("platform:sof_rt5682");

MODULE_ALIAS("platform:tgl_max98357a_rt5682");

MODULE_ALIAS("platform:jsl_rt5682_rt1015");

MODULE_ALIAS("platform:tgl_max98373_rt5682");

CRA Git | Maintained and supported by SUSTech CRA and CCSE