mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
ASoC: Intel: board_helpers: new module for common functions
Create a new module to host common functions for machine drivers. This patch supports Intel HDMI DAI link initialization. Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com> Signed-off-by: Brent Lu <brent.lu@intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Link: https://lore.kernel.org/r/20231012190826.142619-20-pierre-louis.bossart@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
edb3fea37f
commit
7368ae921b
4 changed files with 172 additions and 0 deletions
|
@ -44,6 +44,9 @@ config SND_SOC_INTEL_SOF_NUVOTON_COMMON
|
|||
config SND_SOC_INTEL_SOF_SSP_COMMON
|
||||
tristate
|
||||
|
||||
config SND_SOC_INTEL_SOF_BOARD_HELPERS
|
||||
tristate
|
||||
|
||||
if SND_SOC_INTEL_CATPT
|
||||
|
||||
config SND_SOC_INTEL_HASWELL_MACH
|
||||
|
|
|
@ -102,3 +102,6 @@ obj-$(CONFIG_SND_SOC_INTEL_SOF_NUVOTON_COMMON) += snd-soc-intel-sof-nuvoton-comm
|
|||
|
||||
snd-soc-intel-sof-ssp-common-objs += sof_ssp_common.o
|
||||
obj-$(CONFIG_SND_SOC_INTEL_SOF_SSP_COMMON) += snd-soc-intel-sof-ssp-common.o
|
||||
|
||||
snd-soc-intel-sof-board-helpers-objs += sof_board_helpers.o
|
||||
obj-$(CONFIG_SND_SOC_INTEL_SOF_BOARD_HELPERS) += snd-soc-intel-sof-board-helpers.o
|
||||
|
|
112
sound/soc/intel/boards/sof_board_helpers.c
Normal file
112
sound/soc/intel/boards/sof_board_helpers.c
Normal file
|
@ -0,0 +1,112 @@
|
|||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
//
|
||||
// Copyright(c) 2023 Intel Corporation. All rights reserved.
|
||||
|
||||
#include <sound/soc.h>
|
||||
#include "hda_dsp_common.h"
|
||||
#include "sof_board_helpers.h"
|
||||
|
||||
/*
|
||||
* Intel HDMI DAI Link
|
||||
*/
|
||||
static int hdmi_init(struct snd_soc_pcm_runtime *rtd)
|
||||
{
|
||||
struct sof_card_private *ctx = snd_soc_card_get_drvdata(rtd->card);
|
||||
struct snd_soc_dai *dai = snd_soc_rtd_to_codec(rtd, 0);
|
||||
|
||||
ctx->hdmi.hdmi_comp = dai->component;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int sof_intel_board_card_late_probe(struct snd_soc_card *card)
|
||||
{
|
||||
struct sof_card_private *ctx = snd_soc_card_get_drvdata(card);
|
||||
|
||||
if (!ctx->hdmi_num)
|
||||
return 0;
|
||||
|
||||
if (!ctx->hdmi.idisp_codec)
|
||||
return 0;
|
||||
|
||||
if (!ctx->hdmi.hdmi_comp)
|
||||
return -EINVAL;
|
||||
|
||||
return hda_dsp_hdmi_build_controls(card, ctx->hdmi.hdmi_comp);
|
||||
}
|
||||
EXPORT_SYMBOL_NS(sof_intel_board_card_late_probe, SND_SOC_INTEL_SOF_BOARD_HELPERS);
|
||||
|
||||
/*
|
||||
* DAI Link Helpers
|
||||
*/
|
||||
static struct snd_soc_dai_link_component platform_component[] = {
|
||||
{
|
||||
/* name might be overridden during probe */
|
||||
.name = "0000:00:1f.3"
|
||||
}
|
||||
};
|
||||
|
||||
int sof_intel_board_set_intel_hdmi_link(struct device *dev,
|
||||
struct snd_soc_dai_link *link, int be_id,
|
||||
int hdmi_id, bool idisp_codec)
|
||||
{
|
||||
struct snd_soc_dai_link_component *cpus, *codecs;
|
||||
|
||||
dev_dbg(dev, "link %d: intel hdmi, hdmi id %d, idisp codec %d\n",
|
||||
be_id, hdmi_id, idisp_codec);
|
||||
|
||||
/* link name */
|
||||
link->name = devm_kasprintf(dev, GFP_KERNEL, "iDisp%d", hdmi_id);
|
||||
if (!link->name)
|
||||
return -ENOMEM;
|
||||
|
||||
/* cpus */
|
||||
cpus = devm_kzalloc(dev, sizeof(struct snd_soc_dai_link_component),
|
||||
GFP_KERNEL);
|
||||
if (!cpus)
|
||||
return -ENOMEM;
|
||||
|
||||
cpus->dai_name = devm_kasprintf(dev, GFP_KERNEL, "iDisp%d Pin", hdmi_id);
|
||||
if (!cpus->dai_name)
|
||||
return -ENOMEM;
|
||||
|
||||
link->cpus = cpus;
|
||||
link->num_cpus = 1;
|
||||
|
||||
/* codecs */
|
||||
if (idisp_codec) {
|
||||
codecs = devm_kzalloc(dev,
|
||||
sizeof(struct snd_soc_dai_link_component),
|
||||
GFP_KERNEL);
|
||||
if (!codecs)
|
||||
return -ENOMEM;
|
||||
|
||||
codecs->name = "ehdaudio0D2";
|
||||
codecs->dai_name = devm_kasprintf(dev, GFP_KERNEL,
|
||||
"intel-hdmi-hifi%d", hdmi_id);
|
||||
if (!codecs->dai_name)
|
||||
return -ENOMEM;
|
||||
|
||||
link->codecs = codecs;
|
||||
} else {
|
||||
link->codecs = &snd_soc_dummy_dlc;
|
||||
}
|
||||
link->num_codecs = 1;
|
||||
|
||||
/* platforms */
|
||||
link->platforms = platform_component;
|
||||
link->num_platforms = ARRAY_SIZE(platform_component);
|
||||
|
||||
link->id = be_id;
|
||||
link->init = (hdmi_id == 1) ? hdmi_init : NULL;
|
||||
link->no_pcm = 1;
|
||||
link->dpcm_playback = 1;
|
||||
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL_NS(sof_intel_board_set_intel_hdmi_link, SND_SOC_INTEL_SOF_BOARD_HELPERS);
|
||||
|
||||
MODULE_DESCRIPTION("ASoC Intel SOF Machine Driver Board Helpers");
|
||||
MODULE_AUTHOR("Brent Lu <brent.lu@intel.com>");
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_IMPORT_NS(SND_SOC_INTEL_HDA_DSP_COMMON);
|
54
sound/soc/intel/boards/sof_board_helpers.h
Normal file
54
sound/soc/intel/boards/sof_board_helpers.h
Normal file
|
@ -0,0 +1,54 @@
|
|||
/* SPDX-License-Identifier: GPL-2.0-only */
|
||||
/*
|
||||
* Copyright(c) 2023 Intel Corporation.
|
||||
*/
|
||||
|
||||
#ifndef __SOF_INTEL_BOARD_HELPERS_H
|
||||
#define __SOF_INTEL_BOARD_HELPERS_H
|
||||
|
||||
#include <sound/soc.h>
|
||||
#include "sof_hdmi_common.h"
|
||||
#include "sof_ssp_common.h"
|
||||
|
||||
/*
|
||||
* sof_rt5682_private: private data for rt5682 machine driver
|
||||
*
|
||||
* @mclk: mclk clock data
|
||||
* @is_legacy_cpu: true for BYT/CHT boards
|
||||
*/
|
||||
struct sof_rt5682_private {
|
||||
struct clk *mclk;
|
||||
bool is_legacy_cpu;
|
||||
};
|
||||
|
||||
/*
|
||||
* sof_card_private: common data for machine drivers
|
||||
*
|
||||
* @headset_jack: headset jack data
|
||||
* @hdmi: init data for hdmi dai link
|
||||
* @codec_type: type of headset codec
|
||||
* @amp_type: type of speaker amplifier
|
||||
* @hdmi_num: number of Intel HDMI BE link
|
||||
* @rt5682: private data for rt5682 machine driver
|
||||
*/
|
||||
struct sof_card_private {
|
||||
struct snd_soc_jack headset_jack;
|
||||
struct sof_hdmi_private hdmi;
|
||||
|
||||
enum sof_ssp_codec codec_type;
|
||||
enum sof_ssp_codec amp_type;
|
||||
|
||||
int hdmi_num;
|
||||
|
||||
union {
|
||||
struct sof_rt5682_private rt5682;
|
||||
};
|
||||
};
|
||||
|
||||
int sof_intel_board_card_late_probe(struct snd_soc_card *card);
|
||||
|
||||
int sof_intel_board_set_intel_hdmi_link(struct device *dev,
|
||||
struct snd_soc_dai_link *link, int be_id,
|
||||
int hdmi_id, bool idisp_codec);
|
||||
|
||||
#endif /* __SOF_INTEL_BOARD_HELPERS_H */
|
Loading…
Reference in a new issue