Unverified Commit 10488630 authored by Naveen Manohar's avatar Naveen Manohar Committed by Mark Brown
Browse files

ASoC: intel/sdw_utils: refactor RT multifunction sdca speaker codecs 



Merge spk_rtd_init for multifunction sdca codecs:rt712/rt722

Signed-off-by: default avatarNaveen Manohar <naveen.m@intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarLiam Girdwood <liam.r.girdwood@intel.com>
Signed-off-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Link: https://patch.msgid.link/20241007075955.12575-3-yung-chuan.liao@linux.intel.com


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

include/sound/soc_sdw_utils.h

+1 −2
Original line number Diff line number Diff line
@@ -234,8 +234,7 @@ int asoc_sdw_rt_sdca_jack_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_s 
int asoc_sdw_rt_amp_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

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

int asoc_sdw_rt711_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *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_rt_mf_sdca_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);

sound/soc/intel/common/soc-acpi-intel-ptl-match.c

+9 −9
Original line number Diff line number Diff line
@@ -36,10 +36,10 @@ static const struct snd_soc_acpi_endpoint single_endpoint = { 
};



/*

 * RT722 is a multi-function codec, three endpoints are created for

 * its headset, amp and dmic functions.

 * Multi-function codecs with three endpoints created for

 * headset, amp and dmic functions.

 */

static const struct snd_soc_acpi_endpoint rt722_endpoints[] = {

static const struct snd_soc_acpi_endpoint rt_mf_endpoints[] = {

	{

		.num = 0,

		.aggregated = 0,
@@ -72,8 +72,8 @@ static const struct snd_soc_acpi_adr_device rt711_sdca_0_adr[] = { 
static const struct snd_soc_acpi_adr_device rt722_0_single_adr[] = {

	{

		.adr = 0x000030025d072201ull,

		.num_endpoints = ARRAY_SIZE(rt722_endpoints),

		.endpoints = rt722_endpoints,

		.num_endpoints = ARRAY_SIZE(rt_mf_endpoints),

		.endpoints = rt_mf_endpoints,

		.name_prefix = "rt722"

	}

};
@@ -81,8 +81,8 @@ static const struct snd_soc_acpi_adr_device rt722_0_single_adr[] = { 
static const struct snd_soc_acpi_adr_device rt722_1_single_adr[] = {

	{

		.adr = 0x000130025d072201ull,

		.num_endpoints = ARRAY_SIZE(rt722_endpoints),

		.endpoints = rt722_endpoints,

		.num_endpoints = ARRAY_SIZE(rt_mf_endpoints),

		.endpoints = rt_mf_endpoints,

		.name_prefix = "rt722"

	}

};
@@ -90,8 +90,8 @@ static const struct snd_soc_acpi_adr_device rt722_1_single_adr[] = { 
static const struct snd_soc_acpi_adr_device rt722_3_single_adr[] = {

	{

		.adr = 0x000330025d072201ull,

		.num_endpoints = ARRAY_SIZE(rt722_endpoints),

		.endpoints = rt722_endpoints,

		.num_endpoints = ARRAY_SIZE(rt_mf_endpoints),

		.endpoints = rt_mf_endpoints,

		.name_prefix = "rt722"

	}

};

sound/soc/sdw_utils/Makefile

+1 −2
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

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_rt_mf_sdca.o		\

		       soc_sdw_bridge_cs35l56.o 			\

		       soc_sdw_cs42l42.o soc_sdw_cs42l43.o 		\

		       soc_sdw_cs_amp.o					\

sound/soc/sdw_utils/soc_sdw_rt712_sdca.c

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

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

// Copyright (c) 2023 Intel Corporation

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



/*

 *  soc_sdw_rt712_sdca - Helpers to handle RT712-SDCA from generic machine driver

 */



#include <linux/device.h>

#include <linux/errno.h>

#include <linux/soundwire/sdw.h>

#include <linux/soundwire/sdw_type.h>

#include <sound/control.h>

#include <sound/soc.h>

#include <sound/soc-acpi.h>

#include <sound/soc-dapm.h>

#include <sound/soc_sdw_utils.h>



/*

 * dapm routes for rt712 spk will be registered dynamically according

 * to the number of rt712 spk used. The first two entries will be registered

 * for one codec case, and the last two entries are also registered

 * if two rt712s are used.

 */

static const struct snd_soc_dapm_route rt712_spk_map[] = {

	{ "Speaker", NULL, "rt712 SPOL" },

	{ "Speaker", NULL, "rt712 SPOR" },

};



int asoc_sdw_rt712_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)

{

	struct snd_soc_card *card = rtd->card;

	int ret;



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

					  "%s spk:rt712",

					  card->components);

	if (!card->components)

		return -ENOMEM;



	ret = snd_soc_dapm_add_routes(&card->dapm, rt712_spk_map, ARRAY_SIZE(rt712_spk_map));

	if (ret)

		dev_err(rtd->dev, "failed to add SPK map: %d\n", ret);



	return ret;

}

EXPORT_SYMBOL_NS(asoc_sdw_rt712_spk_rtd_init, SND_SOC_SDW_UTILS);

sound/soc/sdw_utils/soc_sdw_rt722_sdca.c

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

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

// Copyright (c) 2023 Intel Corporation

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



/*

 *  soc_sdw_rt722_sdca - Helpers to handle RT722-SDCA from generic machine driver

 */



#include <linux/device.h>

#include <linux/errno.h>

#include <linux/soundwire/sdw.h>

#include <linux/soundwire/sdw_type.h>

#include <sound/control.h>

#include <sound/soc.h>

#include <sound/soc-acpi.h>

#include <sound/soc-dapm.h>

#include <sound/soc_sdw_utils.h>



static const struct snd_soc_dapm_route rt722_spk_map[] = {

	{ "Speaker", NULL, "rt722 SPK" },

};



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

{

	struct snd_soc_card *card = rtd->card;

	int ret;



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

					  "%s spk:rt722",

					  card->components);

	if (!card->components)

		return -ENOMEM;



	ret = snd_soc_dapm_add_routes(&card->dapm, rt722_spk_map, ARRAY_SIZE(rt722_spk_map));

	if (ret)

		dev_err(rtd->dev, "failed to add rt722 spk map: %d\n", ret);



	return ret;

}

EXPORT_SYMBOL_NS(asoc_sdw_rt722_spk_rtd_init, SND_SOC_SDW_UTILS);