Skip to contentSkip to conversation

ASoC: SDCA: Initial support for Cirrus Logic CS47L47

PATCH Applied Richard Fitzgerald 4 participants 7 messages Feb 23 – Feb 25

Subsystems (4)
lore
Share & tools
lore
#1 lore raw

PATCH 1/3 soundwire: intel_auxdevice: Add CS47L47 to wake_capable_list

In reply to Richard Fitzgerald

The Cirrus Logic CS47L47 codec can generate Jack events so add it to the wake-capable list.

---
 drivers/soundwire/intel_auxdevice.c | 1 +
 1 file changed, 1 insertion(+)
drivers/soundwire/intel_auxdevice.c +1 -0
index 8752b0e3ce74c..9b92ffdfc73b7 100644
@@ -53,6 +53,7 @@ struct wake_capable_part {
 static struct wake_capable_part wake_capable_list[] = {
 	{0x01fa, 0x4243},
 	{0x01fa, 0x4245},
+	{0x01fa, 0x4747},
 	{0x025d, 0x5682},
 	{0x025d, 0x700},
 	{0x025d, 0x711},
Signature · 1 line
2.47.3
#0 lore raw

cover ASoC: SDCA: Initial support for Cirrus Logic CS47L47

The CS47L47 is a SDCA smart codec with UAJ (headset, jack detect) and DMIC. This series adds the initial support for the Cirrus Logic CS47L47 codec.

The soundwire patch can be taken separately from the two ASoC patches; there aren't any build dependencies.

Richard Fitzgerald (3):
soundwire: intel_auxdevice: Add CS47L47 to wake_capable_list
ASoC: soc_sdw_utils: Add device info for CS47L47
ASoC: SDCA: Add CS47L47 to class driver

 drivers/soundwire/intel_auxdevice.c   |  1 +
 include/sound/soc_sdw_utils.h         |  2 +
 sound/soc/sdca/sdca_class.c           |  1 +
 sound/soc/sdw_utils/Makefile          |  1 +
 sound/soc/sdw_utils/soc_sdw_cs47l47.c | 80 +++++++++++++++++++++++++++
 sound/soc/sdw_utils/soc_sdw_utils.c   | 36 ++++++++++++
 6 files changed, 121 insertions(+)
 create mode 100644 sound/soc/sdw_utils/soc_sdw_cs47l47.c
Signature · 1 line
2.47.3
#3 lore raw

PATCH 3/3 ASoC: SDCA: Add CS47L47 to class driver

Add the SoundWire ID for CS47L47 to the class driver.

---
 sound/soc/sdca/sdca_class.c | 1 +
 1 file changed, 1 insertion(+)
sound/soc/sdca/sdca_class.c +1 -0
index 918b638acb577..55c33ff63ca21 100644
@@ -317,6 +317,7 @@ static const struct dev_pm_ops class_pm_ops = {
 
 static const struct sdw_device_id class_sdw_id[] = {
 	SDW_SLAVE_ENTRY(0x01FA, 0x4245, 0),
+	SDW_SLAVE_ENTRY(0x01FA, 0x4747, 0),
 	{}
 };
 MODULE_DEVICE_TABLE(sdw, class_sdw_id);
Signature · 1 line
2.47.3
#2 lore raw

PATCH 2/3 ASoC: soc_sdw_utils: Add device info for CS47L47

In reply to Richard Fitzgerald

Add a device info entry for the Cirrus Logic CS47L47.

CS47L47 has UAJ (headset speaker + mic + jack detect) and DMICs. The audio ports are similar to the CS42L45 so can be based on the CS42L45 code.

---
 include/sound/soc_sdw_utils.h         |  2 +
 sound/soc/sdw_utils/Makefile          |  1 +
 sound/soc/sdw_utils/soc_sdw_cs47l47.c | 80 +++++++++++++++++++++++++++
 sound/soc/sdw_utils/soc_sdw_utils.c   | 36 ++++++++++++
 4 files changed, 119 insertions(+)
 create mode 100644 sound/soc/sdw_utils/soc_sdw_cs47l47.c
include/sound/soc_sdw_utils.h +2 -0
index 227347c8f0b33..98531e500cbb3 100644
@@ -259,6 +259,8 @@ 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_cs42l45_hs_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
 int asoc_sdw_cs42l45_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
+int asoc_sdw_cs47l47_hs_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
+int asoc_sdw_cs47l47_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);
 /* TI */
sound/soc/sdw_utils/Makefile +1 -0
index e8bd5ffb1a6ad..a8d091fd374b6 100644
@@ -6,6 +6,7 @@ snd-soc-sdw-utils-y := soc_sdw_utils.o soc_sdw_dmic.o soc_sdw_rt_dmic.o \
 		       soc_sdw_bridge_cs35l56.o 			\
 		       soc_sdw_cs42l42.o soc_sdw_cs42l43.o 		\
 		       soc_sdw_cs42l45.o				\
+		       soc_sdw_cs47l47.o				\
 		       soc_sdw_cs_amp.o					\
 		       soc_sdw_maxim.o \
 		       soc_sdw_ti_amp.o
sound/soc/sdw_utils/soc_sdw_cs47l47.c new file +80 -0

80 lines not on this page · raw message

sound/soc/sdw_utils/soc_sdw_utils.c +36 -0
index 0e67d9f34cba3..eeeb91dded9da 100644
@@ -759,6 +759,42 @@ struct asoc_sdw_codec_info codec_info_list[] = {
 		},
 		.aux_num = 1,
 	},
+	{
+		.part_id = 0x4747,
+		.name_prefix = "cs47l47",
+		.dais = {
+			{
+				.direction = {true, false},
+				.codec_name = "snd_soc_sdca.UAJ.1",
+				.dai_name = "IT 41",
+				.dai_type = SOC_SDW_DAI_TYPE_JACK,
+				.dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID},
+				.rtd_init = asoc_sdw_cs47l47_hs_rtd_init,
+			},
+			{
+				.direction = {false, true},
+				.codec_name = "snd_soc_sdca.SmartMic.0",
+				.dai_name = "OT 113",
+				.dai_type = SOC_SDW_DAI_TYPE_MIC,
+				.dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_DMIC_DAI_ID},
+				.rtd_init = asoc_sdw_cs47l47_dmic_rtd_init,
+			},
+			{
+				.direction = {false, true},
+				.codec_name = "snd_soc_sdca.UAJ.1",
+				.dai_name = "OT 36",
+				.dai_type = SOC_SDW_DAI_TYPE_JACK,
+				.dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_JACK_IN_DAI_ID},
+			},
+		},
+		.dai_num = 3,
+		.auxs = {
+			{
+				.codec_name = "snd_soc_sdca.HID.2",
+			},
+		},
+		.aux_num = 1,
+	},
 	{
 		.part_id = 0xaaaa, /* generic codec mockup */
 		.name_prefix = "sdw_mockup_mmulti-function",
Signature · 1 line
2.47.3
reviewer Reviewed-by on the v1 series
#4 lore raw
In reply to Richard Fitzgerald
Quoted 10 lines · Richard Fitzgerald

The CS47L47 is a SDCA smart codec with UAJ (headset, jack detect) and DMIC. This series adds the initial support for the Cirrus Logic CS47L47 codec.

The soundwire patch can be taken separately from the two ASoC patches; there aren't any build dependencies.

Richard Fitzgerald (3):
soundwire: intel_auxdevice: Add CS47L47 to wake_capable_list
ASoC: soc_sdw_utils: Add device info for CS47L47
ASoC: SDCA: Add CS47L47 to class driver

LGTM

Quoted 10 lines
 drivers/soundwire/intel_auxdevice.c   |  1 +
 include/sound/soc_sdw_utils.h         |  2 +
 sound/soc/sdca/sdca_class.c           |  1 +
 sound/soc/sdw_utils/Makefile          |  1 +
 sound/soc/sdw_utils/soc_sdw_cs47l47.c | 80 +++++++++++++++++++++++++++
 sound/soc/sdw_utils/soc_sdw_utils.c   | 36 ++++++++++++
 6 files changed, 121 insertions(+)
 create mode 100644 sound/soc/sdw_utils/soc_sdw_cs47l47.c
maintainer Applied
#5 lore raw

Re: (subset) [PATCH 0/3] ASoC: SDCA: Initial support for Cirrus Logic CS47L47

In reply to Richard Fitzgerald
Quoted 6 lines · Richard Fitzgerald

The CS47L47 is a SDCA smart codec with UAJ (headset, jack detect) and DMIC. This series adds the initial support for the Cirrus Logic CS47L47 codec.

The soundwire patch can be taken separately from the two ASoC patches; there aren't any build dependencies.

Quoted 6 lines

Richard Fitzgerald (3):
soundwire: intel_auxdevice: Add CS47L47 to wake_capable_list
ASoC: soc_sdw_utils: Add device info for CS47L47
ASoC: SDCA: Add CS47L47 to class driver

[...]

Applied, thanks!

[1/3] soundwire: intel_auxdevice: Add CS47L47 to wake_capable_list

      commit: 4b8fc2b17272d4379f3c80cee2d6d8b7d998fa8f

Best regards,

Signature · 1 line
~Vinod
maintainer
#6 lore raw

Re: (subset) [PATCH 0/3] ASoC: SDCA: Initial support for Cirrus Logic CS47L47

In reply to Richard Fitzgerald
Quoted 6 lines · Richard Fitzgerald

The CS47L47 is a SDCA smart codec with UAJ (headset, jack detect) and DMIC. This series adds the initial support for the Cirrus Logic CS47L47 codec.

The soundwire patch can be taken separately from the two ASoC patches; there aren't any build dependencies.

Quoted 6 lines

Richard Fitzgerald (3):
soundwire: intel_auxdevice: Add CS47L47 to wake_capable_list
ASoC: soc_sdw_utils: Add device info for CS47L47
ASoC: SDCA: Add CS47L47 to class driver

[...]

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[2/3] ASoC: soc_sdw_utils: Add device info for CS47L47

      commit: 80930d81c4b0753ba2ca750708e4d2fcc0627dc8
[3/3] ASoC: SDCA: Add CS47L47 to class driver
      commit: ada32396f90951e12465224c04742607ca56a982

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark