0d7f2459ae
Speaker amp's SSP bclk configuration was changed in the topology file to be
based on 12.288MHz and dai_ops->hw_params is based on s32le format.
But, the TDM slot size remained set to 24 bits.
This inconsistency created audible noises and needs to be corrected.
This patch updates TDM slot width to 32.
Fixes: bc7477fc2a ("ASoC: Intel: Boards: tgl_max98373: Update TDM configuration in hw_params")
Signed-off-by: Sathyanarayana Nujella <sathyanarayana.nujella@intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20201201211150.433472-1-ranjani.sridharan@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
126 lines
3.2 KiB
C
126 lines
3.2 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
//
|
|
// 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"
|
|
|
|
#define MAX_98373_PIN_NAME 16
|
|
|
|
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 Right */
|
|
.name = MAX_98373_DEV0_NAME,
|
|
.dai_name = MAX_98373_CODEC_DAI,
|
|
},
|
|
{ /* For Left */
|
|
.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 = asoc_substream_to_rtd(substream);
|
|
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, 0x03, 3, 8, 32);
|
|
}
|
|
if (!strcmp(codec_dai->component->name, MAX_98373_DEV1_NAME)) {
|
|
/* DEV1 tdm slot configuration */
|
|
snd_soc_dai_set_tdm_slot(codec_dai, 0x0C, 3, 8, 32);
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
int max98373_trigger(struct snd_pcm_substream *substream, int cmd)
|
|
{
|
|
struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
|
|
struct snd_soc_dai *codec_dai;
|
|
int j;
|
|
int ret = 0;
|
|
|
|
/* set spk pin by playback only */
|
|
if (substream->stream == SNDRV_PCM_STREAM_CAPTURE)
|
|
return 0;
|
|
|
|
for_each_rtd_codec_dais(rtd, j, codec_dai) {
|
|
struct snd_soc_component *component = codec_dai->component;
|
|
struct snd_soc_dapm_context *dapm =
|
|
snd_soc_component_get_dapm(component);
|
|
char pin_name[MAX_98373_PIN_NAME];
|
|
|
|
snprintf(pin_name, ARRAY_SIZE(pin_name), "%s Spk",
|
|
codec_dai->component->name_prefix);
|
|
|
|
switch (cmd) {
|
|
case SNDRV_PCM_TRIGGER_START:
|
|
case SNDRV_PCM_TRIGGER_RESUME:
|
|
case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
|
|
ret = snd_soc_dapm_enable_pin(dapm, pin_name);
|
|
if (!ret)
|
|
snd_soc_dapm_sync(dapm);
|
|
break;
|
|
case SNDRV_PCM_TRIGGER_STOP:
|
|
case SNDRV_PCM_TRIGGER_SUSPEND:
|
|
case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
|
|
ret = snd_soc_dapm_disable_pin(dapm, pin_name);
|
|
if (!ret)
|
|
snd_soc_dapm_sync(dapm);
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
struct snd_soc_ops max_98373_ops = {
|
|
.hw_params = max98373_hw_params,
|
|
.trigger = max98373_trigger,
|
|
};
|
|
|
|
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);
|
|
}
|