Unverified Commit cc676c0d authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: intel: Add CS42L43 sdw machine driver support 

Merge series from Bard Liao <yung-chuan.liao@linux.intel.com>:

Add cs42l43 codec support to sof_sdw machine driver.
parents 3fd61ce9 05fe6284

sound/soc/intel/boards/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -689,6 +689,10 @@ 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_CS42L43

	select SND_SOC_CS42L43_SDW

	select MFD_CS42L43

	select MFD_CS42L43_SDW

	select SND_SOC_CS35L56_SDW

	select SND_SOC_DMIC

	select SND_SOC_INTEL_HDA_DSP_COMMON

sound/soc/intel/boards/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -42,7 +42,8 @@ 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_cs_amp.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.c

+27 −0
Original line number Diff line number Diff line
@@ -915,6 +915,33 @@ static struct sof_sdw_codec_info codec_info_list[] = { 
		},

		.dai_num = 1,

	},

	{

		.part_id = 0x4243,

		.codec_name = "cs42l43-codec",

		.dais = {

			{

				.direction = {true, false},

				.dai_name = "cs42l43-dp5",

				.dai_type = SOF_SDW_DAI_TYPE_JACK,

				.dailink = {SDW_JACK_OUT_DAI_ID, SDW_UNUSED_DAI_ID},

				.init = sof_sdw_cs42l43_hs_init,

			},

			{

				.direction = {false, true},

				.dai_name = "cs42l43-dp1",

				.dai_type = SOF_SDW_DAI_TYPE_JACK,

				.dailink = {SDW_UNUSED_DAI_ID, SDW_JACK_IN_DAI_ID},

			},

			{

				.direction = {false, true},

				.dai_name = "cs42l43-dp2",

				.dai_type = SOF_SDW_DAI_TYPE_MIC,

				.dailink = {SDW_UNUSED_DAI_ID, SDW_DMIC_DAI_ID},

				.init = sof_sdw_cs42l43_dmic_init,

			}

		},

		.dai_num = 3,

	},

	{

		.part_id = 0xaaaa, /* generic codec mockup */

		.version_id = 0,

sound/soc/intel/boards/sof_sdw_common.h

+13 −0
Original line number Diff line number Diff line
@@ -210,6 +210,19 @@ int sof_sdw_cs42l42_init(struct snd_soc_card *card, 
			 struct sof_sdw_codec_info *info,

			 bool playback);



/* CS42L43 support */

int sof_sdw_cs42l43_hs_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);



int sof_sdw_cs42l43_dmic_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);



/* CS AMP support */

int sof_sdw_cs_amp_init(struct snd_soc_card *card,

			const struct snd_soc_acpi_link_adr *link,

sound/soc/intel/boards/sof_sdw_cs42l43.c

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

// Based on sof_sdw_rt5682.c

// Copyright (c) 2023 Intel Corporation



/*

 *  sof_sdw_cs42l43 - Helpers to handle CS42L43 from generic machine driver

 */

#include <linux/device.h>

#include <linux/errno.h>

#include <linux/input.h>

#include <sound/jack.h>

#include <linux/soundwire/sdw.h>

#include <linux/soundwire/sdw_type.h>

#include <sound/cs42l43.h>

#include <sound/control.h>

#include <sound/soc.h>

#include <sound/soc-acpi.h>

#include <sound/soc-dapm.h>

#include "sof_sdw_common.h"



static const struct snd_soc_dapm_widget cs42l43_hs_widgets[] = {

	SND_SOC_DAPM_HP("Headphone", NULL),

	SND_SOC_DAPM_MIC("Headset Mic", NULL),

};



static const struct snd_soc_dapm_route cs42l43_hs_map[] = {

	{ "Headphone", NULL, "cs42l43 AMP3_OUT" },

	{ "Headphone", NULL, "cs42l43 AMP4_OUT" },

	{ "cs42l43 ADC1_IN1_P", NULL, "Headset Mic" },

	{ "cs42l43 ADC1_IN1_N", NULL, "Headset Mic" },

};



static const struct snd_soc_dapm_widget cs42l43_dmic_widgets[] = {

	SND_SOC_DAPM_MIC("DMIC", NULL),

};



static const struct snd_soc_dapm_route cs42l43_dmic_map[] = {

	{ "cs42l43 PDM1_DIN", NULL, "DMIC" },

	{ "cs42l43 PDM2_DIN", NULL, "DMIC" },

};



static int cs42l43_hs_rtd_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component;

	struct mc_private *ctx = snd_soc_card_get_drvdata(rtd->card);

	struct snd_soc_jack *jack = &ctx->sdw_headset;

	struct snd_soc_card *card = rtd->card;

	int ret;



	card->components = devm_kasprintf(card->dev, GFP_KERNEL, "%s hs:cs42l43", card->components);

	if (!card->components)

		return -ENOMEM;



	ret = snd_soc_dapm_new_controls(&card->dapm, cs42l43_hs_widgets,

					ARRAY_SIZE(cs42l43_hs_widgets));

	if (ret) {

		dev_err(card->dev, "cs42l43 hs widgets addition failed: %d\n", ret);

		return ret;

	}



	ret = snd_soc_dapm_add_routes(&card->dapm, cs42l43_hs_map,

				      ARRAY_SIZE(cs42l43_hs_map));



	if (ret) {

		dev_err(card->dev, "cs42l43 hs map addition failed: %d\n", ret);

		return ret;

	}



	ret = snd_soc_card_jack_new(card, "Headphone Jack",

				    SND_JACK_MECHANICAL | SND_JACK_AVOUT |

				    SND_JACK_HEADSET | SND_JACK_LINEOUT |

				    SND_JACK_BTN_0 | SND_JACK_BTN_1 |

				    SND_JACK_BTN_2 | SND_JACK_BTN_3,

				    jack);

	if (ret) {

		dev_err(card->dev, "Failed to create jack: %d\n", ret);

		return ret;

	}



	snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_PLAYPAUSE);

	snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOICECOMMAND);

	snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP);

	snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN);



	ret = snd_soc_component_set_jack(component, jack, NULL);

	if (ret) {

		dev_err(card->dev, "Failed to register jack: %d\n", ret);

		return ret;

	}



	ret = snd_soc_component_set_sysclk(component, CS42L43_SYSCLK, CS42L43_SYSCLK_SDW,

					   0, SND_SOC_CLOCK_IN);

	if (ret)

		dev_err(card->dev, "Failed to set sysclk: %d\n", ret);



	return ret;

}



int sof_sdw_cs42l43_hs_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)

{

	/*

	 * No need to test if (!playback) like other codecs as cs42l43 uses separated dai for

	 * playback and capture, and sof_sdw_cs42l43_init is only linked to the playback dai.

	 */



	dai_links->init = cs42l43_hs_rtd_init;



	return 0;

}



static int cs42l43_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_card *card = rtd->card;

	int ret;



	card->components = devm_kasprintf(card->dev, GFP_KERNEL, "%s mic:cs42l43-dmic",

					  card->components);

	if (!card->components)

		return -ENOMEM;



	ret = snd_soc_dapm_new_controls(&card->dapm, cs42l43_dmic_widgets,

					ARRAY_SIZE(cs42l43_dmic_widgets));

	if (ret) {

		dev_err(card->dev, "cs42l43 dmic widgets addition failed: %d\n", ret);

		return ret;

	}



	ret = snd_soc_dapm_add_routes(&card->dapm, cs42l43_dmic_map,

				      ARRAY_SIZE(cs42l43_dmic_map));



	if (ret)

		dev_err(card->dev, "cs42l43 dmic map addition failed: %d\n", ret);



	return ret;

}



int sof_sdw_cs42l43_dmic_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)

{

	dai_links->init = cs42l43_dmic_rtd_init;

	return 0;

}