Unverified Commit 4754e29c authored by Chao Song's avatar Chao Song Committed by Mark Brown
Browse files

ASoC: Intel: sof_sdw: add cs35l56 codec info 



Add cs35l56 support in sof_sdw machine driver.

Reviewed-by: default avatarRander Wang <rander.wang@intel.com>
Signed-off-by: default avatarChao Song <chao.song@linux.intel.com>
Signed-off-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20230731214257.444605-21-pierre-louis.bossart@linux.intel.com


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

sound/soc/intel/boards/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -679,6 +679,7 @@ config SND_SOC_INTEL_SOUNDWIRE_SOF_MACH 
	select SND_SOC_RT1318_SDW

	select SND_SOC_RT5682_SDW

	select SND_SOC_CS42L42_SDW

	select SND_SOC_CS35L56_SDW

	select SND_SOC_DMIC

	select SND_SOC_INTEL_HDA_DSP_COMMON

	select SND_SOC_INTEL_SOF_MAXIM_COMMON

sound/soc/intel/boards/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ snd-soc-sof-sdw-objs += sof_sdw.o \ 
			sof_sdw_rt711.o sof_sdw_rt_sdca_jack_common.o	\

			sof_sdw_rt712_sdca.o sof_sdw_rt715.o	\

			sof_sdw_rt715_sdca.o sof_sdw_dmic.o	\

			sof_sdw_cs42l42.o \

			sof_sdw_cs42l42.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.c

+13 −0
Original line number Diff line number Diff line
@@ -903,6 +903,19 @@ static struct sof_sdw_codec_info codec_info_list[] = { 
		},

		.dai_num = 1,

	},

	{

		.part_id = 0x3556,

		.dais = {

			{

				.direction = {true, true},

				.dai_name = "cs35l56-sdw1",

				.dai_type = SOF_SDW_DAI_TYPE_AMP,

				.dailink = {SDW_AMP_OUT_DAI_ID, SDW_AMP_IN_DAI_ID},

				.init = sof_sdw_cs_amp_init,

			},

		},

		.dai_num = 1,

	},

	{

		.part_id = 0x4242,

		.dais = {

sound/soc/intel/boards/sof_sdw_common.h

+6 −0
Original line number Diff line number Diff line
@@ -206,4 +206,10 @@ int sof_sdw_cs42l42_init(struct snd_soc_card *card, 
			 struct sof_sdw_codec_info *info,

			 bool playback);



/* CS AMP support */

int sof_sdw_cs_amp_init(struct snd_soc_card *card,

			const struct snd_soc_acpi_link_adr *link,

			struct snd_soc_dai_link *dai_links,

			struct sof_sdw_codec_info *info,

			bool playback);

#endif

sound/soc/intel/boards/sof_sdw_cs_amp.c

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

// Copyright (c) 2023 Intel Corporation



/*

 *  sof_sdw_cs_amp - Helpers to handle CS35L56 from generic machine driver

 */



#include <linux/device.h>

#include <linux/errno.h>

#include <sound/soc.h>

#include <sound/soc-acpi.h>

#include "sof_sdw_common.h"



#define CODEC_NAME_SIZE	8



static int cs_spk_init(struct snd_soc_pcm_runtime *rtd)

{

	const char *dai_name = rtd->dai_link->codecs->dai_name;

	struct snd_soc_card *card = rtd->card;

	char codec_name[CODEC_NAME_SIZE];



	snprintf(codec_name, CODEC_NAME_SIZE, "%s", dai_name);

	card->components = devm_kasprintf(card->dev, GFP_KERNEL,

					  "%s spk:%s",

					  card->components, codec_name);

	if (!card->components)

		return -ENOMEM;



	return 0;

}





int sof_sdw_cs_amp_init(struct snd_soc_card *card,

			const struct snd_soc_acpi_link_adr *link,

			struct snd_soc_dai_link *dai_links,

			struct sof_sdw_codec_info *info,

			bool playback)

{

	/* Count amp number and do init on playback link only. */

	if (!playback)

		return 0;



	info->amp_num++;

	dai_links->init = cs_spk_init;



	return 0;

}