Unverified Commit 5fa46627 authored by Vijendar Mukunda's avatar Vijendar Mukunda Committed by Mark Brown
Browse files

ASoC: intel/sdw_utils: move cirrus soundwire codec helper functions 

To make it generic, move Cirrus Soundwire codec helper functions to
common place holder so that it can be used by other platform machine
driver.

Link: https://github.com/thesofproject/linux/pull/5068


Signed-off-by: default avatarVijendar Mukunda <Vijendar.Mukunda@amd.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://patch.msgid.link/20240801091446.10457-20-Vijendar.Mukunda@amd.com


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

include/sound/soc_sdw_utils.h

+40 −0
Original line number Diff line number Diff line
@@ -16,6 +16,19 @@ 
#define SOC_SDW_MAX_NO_PROPS		2

#define SOC_SDW_JACK_JDSRC(quirk)	((quirk) & GENMASK(3, 0))



/* If a CODEC has an optional speaker output, this quirk will enable it */

#define SOC_SDW_CODEC_SPKR			BIT(15)

/*

 * If the CODEC has additional devices attached directly to it.

 *

 * For the cs42l43:

 *   - 0 - No speaker output

 *   - SOC_SDW_CODEC_SPKR - CODEC internal speaker

 *   - SOC_SDW_SIDECAR_AMPS - 2x Sidecar amplifiers + CODEC internal speaker

 *   - SOC_SDW_CODEC_SPKR | SOF_SIDECAR_AMPS - Not currently supported

 */

#define SOC_SDW_SIDECAR_AMPS		BIT(16)



struct asoc_sdw_codec_info;



struct asoc_sdw_dai_info {
@@ -109,6 +122,28 @@ int asoc_sdw_rt_amp_init(struct snd_soc_card *card, 
			 bool playback);

int asoc_sdw_rt_amp_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link);



/* CS42L43 support */

int asoc_sdw_cs42l43_spk_init(struct snd_soc_card *card,

			      struct snd_soc_dai_link *dai_links,

			      struct asoc_sdw_codec_info *info,

			      bool playback);



/* CS AMP support */

int asoc_sdw_bridge_cs35l56_count_sidecar(struct snd_soc_card *card,

					  int *num_dais, int *num_devs);

int asoc_sdw_bridge_cs35l56_add_sidecar(struct snd_soc_card *card,

					struct snd_soc_dai_link **dai_links,

					struct snd_soc_codec_conf **codec_conf);

int asoc_sdw_bridge_cs35l56_spk_init(struct snd_soc_card *card,

				     struct snd_soc_dai_link *dai_links,

				     struct asoc_sdw_codec_info *info,

				     bool playback);



int asoc_sdw_cs_amp_init(struct snd_soc_card *card,

			 struct snd_soc_dai_link *dai_links,

			 struct asoc_sdw_codec_info *info,

			 bool playback);



/* dai_link init callbacks */

int asoc_sdw_rt_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int asoc_sdw_rt_sdca_jack_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
@@ -118,5 +153,10 @@ int asoc_sdw_rt711_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai 
int asoc_sdw_rt712_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int asoc_sdw_rt722_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int asoc_sdw_rt5682_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int asoc_sdw_cs42l42_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int asoc_sdw_cs42l43_hs_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int asoc_sdw_cs42l43_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int asoc_sdw_cs42l43_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int asoc_sdw_cs_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);



#endif

sound/soc/intel/boards/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -36,9 +36,6 @@ snd-soc-ehl-rt5660-y := ehl_rt5660.o 
snd-soc-sof-ssp-amp-y := sof_ssp_amp.o

snd-soc-sof-sdw-y += sof_sdw.o				\

			sof_sdw_maxim.o 		\

			bridge_cs35l56.o			\

			sof_sdw_cs42l42.o sof_sdw_cs42l43.o	\

			sof_sdw_cs_amp.o			\

			sof_sdw_hdmi.o

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

obj-$(CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH) += snd-soc-sof_cs42l42.o

sound/soc/intel/boards/sof_sdw_common.h

+0 −39
Original line number Diff line number Diff line
@@ -52,18 +52,6 @@ enum { 
#define SOF_SSP_GET_PORT(quirk)	(((quirk) >> 7) & GENMASK(5, 0))

/* Deprecated and no longer supported by the code */

#define SOC_SDW_NO_AGGREGATION		BIT(14)

/* If a CODEC has an optional speaker output, this quirk will enable it */

#define SOC_SDW_CODEC_SPKR		BIT(15)

/*

 * If the CODEC has additional devices attached directly to it.

 *

 * For the cs42l43:

 *   - 0 - No speaker output

 *   - SOC_SDW_CODEC_SPKR - CODEC internal speaker

 *   - SOC_SDW_SIDECAR_AMPS - 2x Sidecar amplifiers + CODEC internal speaker

 *   - SOC_SDW_CODEC_SPKR | SOC_SDW_SIDECAR_AMPS - Not currently supported

 */

#define SOC_SDW_SIDECAR_AMPS		BIT(16)



/* BT audio offload: reserve 3 bits for future */

#define SOF_BT_OFFLOAD_SSP_SHIFT	15
@@ -95,35 +83,8 @@ int asoc_sdw_maxim_init(struct snd_soc_card *card, 
			struct asoc_sdw_codec_info *info,

			bool playback);



/* CS42L43 support */

int asoc_sdw_cs42l43_spk_init(struct snd_soc_card *card,

			      struct snd_soc_dai_link *dai_links,

			      struct asoc_sdw_codec_info *info,

			      bool playback);



/* CS AMP support */

int asoc_sdw_bridge_cs35l56_count_sidecar(struct snd_soc_card *card,

					  int *num_dais, int *num_devs);

int asoc_sdw_bridge_cs35l56_add_sidecar(struct snd_soc_card *card,

					struct snd_soc_dai_link **dai_links,

					struct snd_soc_codec_conf **codec_conf);

int asoc_sdw_bridge_cs35l56_spk_init(struct snd_soc_card *card,

				     struct snd_soc_dai_link *dai_links,

				     struct asoc_sdw_codec_info *info,

				     bool playback);



int asoc_sdw_cs_amp_init(struct snd_soc_card *card,

			 struct snd_soc_dai_link *dai_links,

			 struct asoc_sdw_codec_info *info,

			 bool playback);



/* dai_link init callbacks */



int asoc_sdw_cs42l42_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int asoc_sdw_cs42l43_hs_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int asoc_sdw_cs42l43_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int asoc_sdw_cs42l43_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int asoc_sdw_cs_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int asoc_sdw_maxim_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);



#endif

sound/soc/sdw_utils/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -3,5 +3,8 @@ snd-soc-sdw-utils-y := soc_sdw_utils.o soc_sdw_dmic.o soc_sdw_rt_dmic.o \ 
		       soc_sdw_rt700.o soc_sdw_rt711.o 			\

		       soc_sdw_rt712_sdca.o soc_sdw_rt722_sdca.o	\

		       soc_sdw_rt5682.o soc_sdw_rt_sdca_jack_common.o	\

		       soc_sdw_rt_amp.o

		       soc_sdw_rt_amp.o					\

		       soc_sdw_bridge_cs35l56.o 			\

		       soc_sdw_cs42l42.o soc_sdw_cs42l43.o 		\

		       soc_sdw_cs_amp.o

obj-$(CONFIG_SND_SOC_SDW_UTILS) += snd-soc-sdw-utils.o

sound/soc/intel/boards/bridge_cs35l56.c→sound/soc/sdw_utils/soc_sdw_bridge_cs35l56.c

+26 −12
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

//

// Intel SOF Machine Driver with Cirrus Logic CS35L56 Smart Amp

// This file incorporates work covered by the following copyright notice:

// Copyright (c) 2024 Intel Corporation

// Copyright (c) 2024 Advanced Micro Devices, Inc.



/*

 * soc_sdw_bridge_cs35l56 - codec helper functions for handling CS35L56 Smart AMP

 */



#include <linux/module.h>

#include <linux/platform_device.h>
@@ -9,7 +14,7 @@ 
#include <sound/pcm_params.h>

#include <sound/soc.h>

#include <sound/soc-acpi.h>

#include "sof_sdw_common.h"

#include <sound/soc_sdw_utils.h>



static const struct snd_soc_dapm_widget bridge_widgets[] = {

	SND_SOC_DAPM_SPK("Bridge Speaker", NULL),
@@ -25,7 +30,7 @@ static const char * const bridge_cs35l56_name_prefixes[] = { 
	"AMPR",

};



static int bridge_cs35l56_asp_init(struct snd_soc_pcm_runtime *rtd)

static int asoc_sdw_bridge_cs35l56_asp_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_card *card = rtd->card;

	int i, ret;
@@ -73,7 +78,7 @@ static int bridge_cs35l56_asp_init(struct snd_soc_pcm_runtime *rtd) 
	return 0;

}



static const struct snd_soc_pcm_stream bridge_params = {

static const struct snd_soc_pcm_stream asoc_sdw_bridge_params = {

	.formats = SNDRV_PCM_FMTBIT_S16_LE,

	.rate_min = 48000,

	.rate_max = 48000,
@@ -81,7 +86,7 @@ static const struct snd_soc_pcm_stream bridge_params = { 
	.channels_max = 2,

};



SND_SOC_DAILINK_DEFS(bridge_dai,

SND_SOC_DAILINK_DEFS(asoc_sdw_bridge_dai,

		     DAILINK_COMP_ARRAY(COMP_CODEC("cs42l43-codec", "cs42l43-asp")),

		     DAILINK_COMP_ARRAY(COMP_CODEC("spi-cs35l56-left", "cs35l56-asp1"),

					COMP_CODEC("spi-cs35l56-right", "cs35l56-asp1")),
@@ -89,28 +94,33 @@ SND_SOC_DAILINK_DEFS(bridge_dai, 


static const struct snd_soc_dai_link bridge_dai_template = {

	.name = "cs42l43-cs35l56",

	.init = bridge_cs35l56_asp_init,

	.c2c_params = &bridge_params,

	.init = asoc_sdw_bridge_cs35l56_asp_init,

	.c2c_params = &asoc_sdw_bridge_params,

	.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_IB_IF | SND_SOC_DAIFMT_CBC_CFC,

	SND_SOC_DAILINK_REG(bridge_dai),

	SND_SOC_DAILINK_REG(asoc_sdw_bridge_dai),

};



int asoc_sdw_bridge_cs35l56_count_sidecar(struct snd_soc_card *card,

					  int *num_dais, int *num_devs)

{

	if (sof_sdw_quirk & SOC_SDW_SIDECAR_AMPS) {

	struct asoc_sdw_mc_private *ctx = snd_soc_card_get_drvdata(card);



	if (ctx->mc_quirk & SOC_SDW_SIDECAR_AMPS) {

		(*num_dais)++;

		(*num_devs) += ARRAY_SIZE(bridge_cs35l56_name_prefixes);

	}



	return 0;

}

EXPORT_SYMBOL_NS(asoc_sdw_bridge_cs35l56_count_sidecar, SND_SOC_SDW_UTILS);



int asoc_sdw_bridge_cs35l56_add_sidecar(struct snd_soc_card *card,

					struct snd_soc_dai_link **dai_links,

					struct snd_soc_codec_conf **codec_conf)

{

	if (sof_sdw_quirk & SOC_SDW_SIDECAR_AMPS) {

	struct asoc_sdw_mc_private *ctx = snd_soc_card_get_drvdata(card);



	if (ctx->mc_quirk & SOC_SDW_SIDECAR_AMPS) {

		**dai_links = bridge_dai_template;



		for (int i = 0; i < ARRAY_SIZE(bridge_cs35l56_name_prefixes); i++) {
@@ -124,14 +134,18 @@ int asoc_sdw_bridge_cs35l56_add_sidecar(struct snd_soc_card *card, 


	return 0;

}

EXPORT_SYMBOL_NS(asoc_sdw_bridge_cs35l56_add_sidecar, SND_SOC_SDW_UTILS);



int asoc_sdw_bridge_cs35l56_spk_init(struct snd_soc_card *card,

				     struct snd_soc_dai_link *dai_links,

				     struct asoc_sdw_codec_info *info,

				     bool playback)

{

	if (sof_sdw_quirk & SOC_SDW_SIDECAR_AMPS)

	struct asoc_sdw_mc_private *ctx = snd_soc_card_get_drvdata(card);



	if (ctx->mc_quirk & SOC_SDW_SIDECAR_AMPS)

		info->amp_num += ARRAY_SIZE(bridge_cs35l56_name_prefixes);



	return 0;

}

EXPORT_SYMBOL_NS(asoc_sdw_bridge_cs35l56_spk_init, SND_SOC_SDW_UTILS);