From: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
To: <broonie@kernel.org>
Cc: <alsa-devel@alsa-project.org>,
<pierre-louis.bossart@linux.intel.com>,
<yung-chuan.liao@linux.intel.com>, <Basavaraj.Hiregoudar@amd.com>,
<Sunil-kumar.Dommati@amd.com>, <venkataprasad.potturu@amd.com>,
"Vijendar Mukunda" <Vijendar.Mukunda@amd.com>,
Liam Girdwood <lgirdwood@gmail.com>,
Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>,
"Cezary Rojewski" <cezary.rojewski@intel.com>,
Peter Ujfalusi <peter.ujfalusi@linux.intel.com>,
Ranjani Sridharan <ranjani.sridharan@linux.intel.com>,
Kai Vehmanen <kai.vehmanen@linux.intel.com>,
Brent Lu <brent.lu@intel.com>,
Charles Keepax <ckeepax@opensource.cirrus.com>,
Maciej Strozek <mstrozek@opensource.cirrus.com>,
Chao Song <chao.song@linux.intel.com>,
Christophe JAILLET <christophe.jaillet@wanadoo.fr>,
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>,
"open list:SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEM..."
<linux-sound@vger.kernel.org>,
open list <linux-kernel@vger.kernel.org>
Subject: [PATCH RESEND 18/31] ASoC: intel/sdw_utils: move rtk amp codec helper functions
Date: Thu, 1 Aug 2024 14:44:33 +0530 [thread overview]
Message-ID: <20240801091446.10457-19-Vijendar.Mukunda@amd.com> (raw)
In-Reply-To: <20240801091446.10457-1-Vijendar.Mukunda@amd.com>
Move RTK amp codec helper functions related implementation to common
place holder to make it generic so that these helper functions will be
used by other platform machine driver modules.
Link: https://github.com/thesofproject/linux/pull/5068
Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
include/sound/soc_sdw_utils.h | 11 +++++++++++
sound/soc/intel/boards/Makefile | 2 +-
sound/soc/intel/boards/sof_sdw_common.h | 11 -----------
sound/soc/sdw_utils/Makefile | 3 ++-
.../soc_sdw_rt_amp.c} | 14 ++++++++++----
.../soc_sdw_rt_amp_coeff_tables.h} | 6 +++---
6 files changed, 27 insertions(+), 20 deletions(-)
rename sound/soc/{intel/boards/sof_sdw_rt_amp.c => sdw_utils/soc_sdw_rt_amp.c} (93%)
rename sound/soc/{intel/boards/sof_sdw_amp_coeff_tables.h => sdw_utils/soc_sdw_rt_amp_coeff_tables.h} (97%)
diff --git a/include/sound/soc_sdw_utils.h b/include/sound/soc_sdw_utils.h
index 3e55cac33176..450542eb3ea0 100644
--- a/include/sound/soc_sdw_utils.h
+++ b/include/sound/soc_sdw_utils.h
@@ -99,9 +99,20 @@ int asoc_sdw_rt_sdca_jack_init(struct snd_soc_card *card,
bool playback);
int asoc_sdw_rt_sdca_jack_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link);
+/* RT1308 I2S support */
+extern const struct snd_soc_ops soc_sdw_rt1308_i2s_ops;
+
+/* generic amp support */
+int asoc_sdw_rt_amp_init(struct snd_soc_card *card,
+ struct snd_soc_dai_link *dai_links,
+ struct asoc_sdw_codec_info *info,
+ bool playback);
+int asoc_sdw_rt_amp_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link);
+
/* 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);
+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);
diff --git a/sound/soc/intel/boards/Makefile b/sound/soc/intel/boards/Makefile
index 9f92f49cc517..70c56bdc180c 100644
--- a/sound/soc/intel/boards/Makefile
+++ b/sound/soc/intel/boards/Makefile
@@ -35,7 +35,7 @@ snd-soc-skl_nau88l25_ssm4567-y := skl_nau88l25_ssm4567.o
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 sof_sdw_rt_amp.o \
+ sof_sdw_maxim.o \
bridge_cs35l56.o \
sof_sdw_cs42l42.o sof_sdw_cs42l43.o \
sof_sdw_cs_amp.o \
diff --git a/sound/soc/intel/boards/sof_sdw_common.h b/sound/soc/intel/boards/sof_sdw_common.h
index 1d7e6df02247..7f856c6018aa 100644
--- a/sound/soc/intel/boards/sof_sdw_common.h
+++ b/sound/soc/intel/boards/sof_sdw_common.h
@@ -89,16 +89,6 @@ int sof_sdw_hdmi_init(struct snd_soc_pcm_runtime *rtd);
int sof_sdw_hdmi_card_late_probe(struct snd_soc_card *card);
-/* RT1308 I2S support */
-extern const struct snd_soc_ops soc_sdw_rt1308_i2s_ops;
-
-/* generic amp support */
-int asoc_sdw_rt_amp_init(struct snd_soc_card *card,
- struct snd_soc_dai_link *dai_links,
- struct asoc_sdw_codec_info *info,
- bool playback);
-int asoc_sdw_rt_amp_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link);
-
/* MAXIM codec support */
int asoc_sdw_maxim_init(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_links,
@@ -135,6 +125,5 @@ int asoc_sdw_cs42l43_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_so
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);
-int asoc_sdw_rt_amp_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
#endif
diff --git a/sound/soc/sdw_utils/Makefile b/sound/soc/sdw_utils/Makefile
index 20516094f453..7851af9b8593 100644
--- a/sound/soc/sdw_utils/Makefile
+++ b/sound/soc/sdw_utils/Makefile
@@ -2,5 +2,6 @@
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_rt5682.o soc_sdw_rt_sdca_jack_common.o \
+ soc_sdw_rt_amp.o
obj-$(CONFIG_SND_SOC_SDW_UTILS) += snd-soc-sdw-utils.o
diff --git a/sound/soc/intel/boards/sof_sdw_rt_amp.c b/sound/soc/sdw_utils/soc_sdw_rt_amp.c
similarity index 93%
rename from sound/soc/intel/boards/sof_sdw_rt_amp.c
rename to sound/soc/sdw_utils/soc_sdw_rt_amp.c
index fff746671c1d..42be01405ab4 100644
--- a/sound/soc/intel/boards/sof_sdw_rt_amp.c
+++ b/sound/soc/sdw_utils/soc_sdw_rt_amp.c
@@ -1,8 +1,10 @@
// SPDX-License-Identifier: GPL-2.0-only
+// This file incorporates work covered by the following copyright notice:
// Copyright (c) 2022 Intel Corporation
+// Copyright (c) 2024 Advanced Micro Devices, Inc.
/*
- * sof_sdw_rt_amp - Helpers to handle RT1308/RT1316/RT1318 from generic machine driver
+ * soc_sdw_rt_amp - Helpers to handle RT1308/RT1316/RT1318 from generic machine driver
*/
#include <linux/device.h>
@@ -14,9 +16,9 @@
#include <linux/soundwire/sdw.h>
#include <linux/soundwire/sdw_type.h>
#include <linux/dmi.h>
-#include "sof_sdw_common.h"
-#include "sof_sdw_amp_coeff_tables.h"
-#include "../../codecs/rt1308.h"
+#include <sound/soc_sdw_utils.h>
+#include "soc_sdw_rt_amp_coeff_tables.h"
+#include "../codecs/rt1308.h"
#define CODEC_NAME_SIZE 7
@@ -199,6 +201,7 @@ int asoc_sdw_rt_amp_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc
return ret;
}
+EXPORT_SYMBOL_NS(asoc_sdw_rt_amp_spk_rtd_init, SND_SOC_SDW_UTILS);
static int rt1308_i2s_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params)
@@ -236,6 +239,7 @@ static int rt1308_i2s_hw_params(struct snd_pcm_substream *substream,
const struct snd_soc_ops soc_sdw_rt1308_i2s_ops = {
.hw_params = rt1308_i2s_hw_params,
};
+EXPORT_SYMBOL_NS(soc_sdw_rt1308_i2s_ops, SND_SOC_SDW_UTILS);
int asoc_sdw_rt_amp_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link)
{
@@ -253,6 +257,7 @@ int asoc_sdw_rt_amp_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai
return 0;
}
+EXPORT_SYMBOL_NS(asoc_sdw_rt_amp_exit, SND_SOC_SDW_UTILS);
int asoc_sdw_rt_amp_init(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_links,
@@ -295,3 +300,4 @@ int asoc_sdw_rt_amp_init(struct snd_soc_card *card,
return 0;
}
+EXPORT_SYMBOL_NS(asoc_sdw_rt_amp_init, SND_SOC_SDW_UTILS);
diff --git a/sound/soc/intel/boards/sof_sdw_amp_coeff_tables.h b/sound/soc/sdw_utils/soc_sdw_rt_amp_coeff_tables.h
similarity index 97%
rename from sound/soc/intel/boards/sof_sdw_amp_coeff_tables.h
rename to sound/soc/sdw_utils/soc_sdw_rt_amp_coeff_tables.h
index 4a3e6fdbd623..4803d134d071 100644
--- a/sound/soc/intel/boards/sof_sdw_amp_coeff_tables.h
+++ b/sound/soc/sdw_utils/soc_sdw_rt_amp_coeff_tables.h
@@ -2,11 +2,11 @@
*/
/*
- * sof_sdw_amp_coeff_tables.h - related coefficients for amplifier parameters
+ * soc_sdw_rt_amp_coeff_tables.h - related coefficients for RTK amplifier parameters
*/
-#ifndef SND_SOC_SOF_SDW_AMP_COEFF_H
-#define SND_SOC_SOF_SDW_AMP_COEFF_H
+#ifndef SND_SOC_SDW_RT_SDW_AMP_COEFF_H
+#define SND_SOC_SDW_RT_SDW_AMP_COEFF_H
#define RT1308_MAX_BQ_REG 480
#define RT1316_MAX_BQ_REG 580
--
2.34.1
next prev parent reply other threads:[~2024-08-01 9:23 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20240801091446.10457-1-Vijendar.Mukunda@amd.com>
2024-08-01 9:14 ` [PATCH RESEND 01/31] ASoC: intel: rename codec_info and dai_info structures names Vijendar Mukunda
2024-08-01 9:14 ` [PATCH RESEND 02/31] ASoC: intel: rename soundwire common header macros Vijendar Mukunda
2024-08-01 9:14 ` [PATCH RESEND 03/31] ASoC: intel: rename soundwire machine driver soc ops Vijendar Mukunda
2024-08-01 9:14 ` [PATCH RESEND 04/31] ASoC: intel: rename soundwire codec helper functions Vijendar Mukunda
2024-08-01 9:14 ` [PATCH RESEND 05/31] ASoC: intel: rename maxim codec macros Vijendar Mukunda
2024-08-01 9:14 ` [PATCH RESEND 06/31] ASoC: intel: rename ignore_pch_dmic variable name Vijendar Mukunda
2024-08-01 9:14 ` [PATCH RESEND 07/31] ASoC: intel/sdw-utils: move soundwire machine driver soc ops Vijendar Mukunda
2024-08-01 9:14 ` [PATCH RESEND 08/31] ASoC: intel: move soundwire machine driver common structures Vijendar Mukunda
2024-08-01 9:14 ` [PATCH RESEND 09/31] ASoC: intel/sdw_utils: move soundwire machine driver helper functions Vijendar Mukunda
2024-08-01 9:14 ` [PATCH RESEND 10/31] ASoC: intel/sdw_utils: move dmic codec helper function Vijendar Mukunda
2024-08-01 9:14 ` [PATCH RESEND 11/31] ASoC: intel/sdw_utils: move rtk dmic helper functions Vijendar Mukunda
2024-08-01 9:14 ` [PATCH RESEND 12/31] ASoC: intel/sdw_utils: move rt712 sdca " Vijendar Mukunda
2024-08-01 9:14 ` [PATCH RESEND 13/31] ASoC: intel/sdw_utils: move rt722 " Vijendar Mukunda
2024-08-01 9:14 ` [PATCH RESEND 14/31] ASoC: intel: split soundwire machine driver private data Vijendar Mukunda
2024-08-01 9:14 ` [PATCH RESEND 15/31] ASoC: intel/sdw_utils: move rt5682 codec helper function Vijendar Mukunda
2024-08-01 9:14 ` [PATCH RESEND 16/31] ASoC: intel/sdw_utils: move rtk jack common helper functions Vijendar Mukunda
2024-08-01 9:14 ` [PATCH RESEND 17/31] ASoC: intel/sdw_utils: move rt700 and rt711 codec " Vijendar Mukunda
2024-08-01 9:14 ` Vijendar Mukunda [this message]
2024-08-01 9:14 ` [PATCH RESEND 19/31] ASoC: intel/sdw_utils: move cirrus soundwire " Vijendar Mukunda
2024-08-01 9:14 ` [PATCH RESEND 20/31] ASoC: intel/sdw_utils: move maxim " Vijendar Mukunda
2024-08-01 11:18 ` [PATCH RESEND 21/31] ASoC: intel/sdw_utils: move dai id common macros Vijendar Mukunda
2024-08-01 11:18 ` [PATCH RESEND 22/31] ASoC: intel/sdw_utils: move soundwire dai type macros Vijendar Mukunda
2024-08-01 11:18 ` [PATCH RESEND 23/31] ASoC: intel/sdw_utils: move soundwire codec_info_list structure Vijendar Mukunda
2024-08-01 11:18 ` [PATCH RESEND 24/31] ASoC: intel/sdw_utils: move machine driver dai link helper functions Vijendar Mukunda
2024-08-01 11:18 ` [PATCH RESEND 25/31] ASoC: sdw_utils: refactor sof_sdw_card_late_probe function Vijendar Mukunda
2024-08-01 11:18 ` [PATCH RESEND 26/31] ASoC: intel/sdw_utils: refactor init_dai_link() and init_simple_dai_link() Vijendar Mukunda
2024-08-01 11:18 ` [PATCH RESEND 27/31] ASoC: soc-acpi: add pci revision id field in mach params structure Vijendar Mukunda
2024-08-01 11:18 ` [PATCH RESEND 28/31] ASoC: amd: acp: add soundwire machines for acp6.3 based platform Vijendar Mukunda
2024-08-01 11:18 ` [PATCH RESEND 29/31] ASoC: SOF: amd: add alternate " Vijendar Mukunda
2024-08-01 11:18 ` [PATCH RESEND 30/31] ASoC: SOF: amd: update mach params subsystem_rev variable Vijendar Mukunda
2024-08-01 11:18 ` [PATCH RESEND 31/31] ASoC: amd/sdw_utils: add sof based soundwire generic machine driver Vijendar Mukunda
2024-08-02 8:37 ` Krzysztof Kozlowski
2024-08-02 8:45 ` Mukunda,Vijendar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240801091446.10457-19-Vijendar.Mukunda@amd.com \
--to=vijendar.mukunda@amd.com \
--cc=Basavaraj.Hiregoudar@amd.com \
--cc=Sunil-kumar.Dommati@amd.com \
--cc=alsa-devel@alsa-project.org \
--cc=brent.lu@intel.com \
--cc=broonie@kernel.org \
--cc=cezary.rojewski@intel.com \
--cc=chao.song@linux.intel.com \
--cc=christophe.jaillet@wanadoo.fr \
--cc=ckeepax@opensource.cirrus.com \
--cc=kai.vehmanen@linux.intel.com \
--cc=kuninori.morimoto.gx@renesas.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=mstrozek@opensource.cirrus.com \
--cc=perex@perex.cz \
--cc=peter.ujfalusi@linux.intel.com \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=ranjani.sridharan@linux.intel.com \
--cc=tiwai@suse.com \
--cc=venkataprasad.potturu@amd.com \
--cc=yung-chuan.liao@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®