ASoC: intel: sof_sdw: add rt711 rt1316 rt714 SDCA codec support. (b75bea4b) · Commits · 戴 / test

sound/soc/intel/boards/Kconfig

+3 −0

Original line number	Diff line number	Diff line
		@@ -569,9 +569,12 @@ config SND_SOC_INTEL_SOUNDWIRE_SOF_MACH
		select SND_SOC_MAX98373_SDW
		select SND_SOC_RT700_SDW
		select SND_SOC_RT711_SDW
		select SND_SOC_RT711_SDCA_SDW
		select SND_SOC_RT1308_SDW
		select SND_SOC_RT1308
		select SND_SOC_RT1316_SDW
		select SND_SOC_RT715_SDW
		select SND_SOC_RT715_SDCA_SDW
		select SND_SOC_RT5682_SDW
		select SND_SOC_DMIC
		help

sound/soc/intel/boards/Makefile

+4 −3

Original line number	Diff line number	Diff line
		@@ -35,9 +35,10 @@ snd-soc-sof_da7219_max98373-objs := sof_da7219_max98373.o hda_dsp_common.o
		snd-soc-ehl-rt5660-objs := ehl_rt5660.o hda_dsp_common.o
		snd-soc-sof-sdw-objs += sof_sdw.o \
		sof_sdw_max98373.o \
		sof_sdw_rt711.o sof_sdw_rt700.o \
		sof_sdw_rt1308.o sof_sdw_rt715.o \
		sof_sdw_rt5682.o \
		sof_sdw_rt1308.o sof_sdw_rt1316.o \
		sof_sdw_rt5682.o sof_sdw_rt700.o \
		sof_sdw_rt711.o sof_sdw_rt711_sdca.o \
		sof_sdw_rt715.o sof_sdw_rt715_sdca.o \
		sof_maxim_common.o \
		sof_sdw_dmic.o sof_sdw_hdmi.o hda_dsp_common.o
		obj-$(CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH) += snd-soc-sof_rt5682.o

sound/soc/intel/boards/sof_sdw.c

+37 −0

Original line number	Diff line number	Diff line
		@@ -141,6 +141,10 @@ static struct snd_soc_codec_conf codec_conf[] = {
		.dlc = COMP_CODEC_CONF("sdw:0:25d:711:0"),
		.name_prefix = "rt711",
		},
		{
		.dlc = COMP_CODEC_CONF("sdw:0:25d:711:1"),
		.name_prefix = "rt711",
		},
		/* rt1308 w/ I2S connection */
		{
		.dlc = COMP_CODEC_CONF("i2c-10EC1308:00"),
		@@ -187,6 +191,18 @@ static struct snd_soc_codec_conf codec_conf[] = {
		.dlc = COMP_CODEC_CONF("sdw:2:25d:5682:0"),
		.name_prefix = "rt5682",
		},
		{
		.dlc = COMP_CODEC_CONF("sdw:1:25d:1316:1"),
		.name_prefix = "rt1316-1",
		},
		{
		.dlc = COMP_CODEC_CONF("sdw:2:25d:1316:1"),
		.name_prefix = "rt1316-2",
		},
		{
		.dlc = COMP_CODEC_CONF("sdw:3:25d:714:1"),
		.name_prefix = "rt714",
		},
		};

		static struct snd_soc_dai_link_component dmic_component[] = {
		@@ -228,6 +244,15 @@ static struct sof_sdw_codec_info codec_info_list[] = {
		},
		{
		.part_id = 0x711,
		.version_id = 3,
		.direction = {true, true},
		.dai_name = "rt711-sdca-aif1",
		.init = sof_sdw_rt711_sdca_init,
		.exit = sof_sdw_rt711_sdca_exit,
		},
		{
		.part_id = 0x711,
		.version_id = 2,
		.direction = {true, true},
		.dai_name = "rt711-aif1",
		.init = sof_sdw_rt711_init,
		@@ -241,6 +266,18 @@ static struct sof_sdw_codec_info codec_info_list[] = {
		.ops = &sof_sdw_rt1308_i2s_ops,
		.init = sof_sdw_rt1308_init,
		},
		{
		.part_id = 0x1316,
		.direction = {true, true},
		.dai_name = "rt1316-aif",
		.init = sof_sdw_rt1316_init,
		},
		{
		.part_id = 0x714,
		.direction = {false, true},
		.dai_name = "rt715-aif2",
		.init = sof_sdw_rt715_sdca_init,
		},
		{
		.part_id = 0x715,
		.direction = {false, true},

sound/soc/intel/boards/sof_sdw_common.h

+19 −0

Original line number	Diff line number	Diff line
		@@ -96,6 +96,13 @@ int sof_sdw_rt711_init(const struct snd_soc_acpi_link_adr *link,
		bool playback);
		int sof_sdw_rt711_exit(struct device dev, struct snd_soc_dai_link dai_link);

		/* RT711-SDCA support */
		int sof_sdw_rt711_sdca_init(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_rt711_sdca_exit(struct device dev, struct snd_soc_dai_link dai_link);

		/* RT700 support */
		int sof_sdw_rt700_init(const struct snd_soc_acpi_link_adr *link,
		struct snd_soc_dai_link *dai_links,
		@@ -110,12 +117,24 @@ int sof_sdw_rt1308_init(const struct snd_soc_acpi_link_adr *link,
		struct sof_sdw_codec_info *info,
		bool playback);

		/* RT1316 support */
		int sof_sdw_rt1316_init(const struct snd_soc_acpi_link_adr *link,
		struct snd_soc_dai_link *dai_links,
		struct sof_sdw_codec_info *info,
		bool playback);

		/* RT715 support */
		int sof_sdw_rt715_init(const struct snd_soc_acpi_link_adr *link,
		struct snd_soc_dai_link *dai_links,
		struct sof_sdw_codec_info *info,
		bool playback);

		/* RT715-SDCA support */
		int sof_sdw_rt715_sdca_init(const struct snd_soc_acpi_link_adr *link,
		struct snd_soc_dai_link *dai_links,
		struct sof_sdw_codec_info *info,
		bool playback);

		/* MAX98373 support */
		int sof_sdw_mx8373_init(const struct snd_soc_acpi_link_adr *link,
		struct snd_soc_dai_link *dai_links,

sound/soc/intel/boards/sof_sdw_rt1316.c

0 → 100644

+113 −0

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		// Copyright (c) 2020 Intel Corporation

		/*
		* sof_sdw_rt1316 - Helpers to handle RT1316 from generic machine driver
		*/

		#include <linux/device.h>
		#include <linux/errno.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 rt1316_widgets[] = {
		SND_SOC_DAPM_SPK("Speaker", NULL),
		};

		/*
		* dapm routes for rt1316 will be registered dynamically according
		* to the number of rt1316 used. The first two entries will be registered
		* for one codec case, and the last two entries are also registered
		* if two 1316s are used.
		*/
		static const struct snd_soc_dapm_route rt1316_map[] = {
		{ "Speaker", NULL, "rt1316-1 SPOL" },
		{ "Speaker", NULL, "rt1316-1 SPOR" },
		{ "Speaker", NULL, "rt1316-2 SPOL" },
		{ "Speaker", NULL, "rt1316-2 SPOR" },
		};

		static const struct snd_kcontrol_new rt1316_controls[] = {
		SOC_DAPM_PIN_SWITCH("Speaker"),
		};

		static int first_spk_init(struct snd_soc_pcm_runtime *rtd)
		{
		struct snd_soc_card *card = rtd->card;
		int ret;

		ret = snd_soc_add_card_controls(card, rt1316_controls,
		ARRAY_SIZE(rt1316_controls));
		if (ret) {
		dev_err(card->dev, "rt1316 controls addition failed: %d\n", ret);
		return ret;
		}

		ret = snd_soc_dapm_new_controls(&card->dapm, rt1316_widgets,
		ARRAY_SIZE(rt1316_widgets));
		if (ret) {
		dev_err(card->dev, "rt1316 widgets addition failed: %d\n", ret);
		return ret;
		}

		ret = snd_soc_dapm_add_routes(&card->dapm, rt1316_map, 2);
		if (ret)
		dev_err(rtd->dev, "failed to add first SPK map: %d\n", ret);

		return ret;
		}

		static int second_spk_init(struct snd_soc_pcm_runtime *rtd)
		{
		struct snd_soc_card *card = rtd->card;
		int ret;

		ret = snd_soc_dapm_add_routes(&card->dapm, rt1316_map + 2, 2);
		if (ret)
		dev_err(rtd->dev, "failed to add second SPK map: %d\n", ret);

		return ret;
		}

		static int all_spk_init(struct snd_soc_pcm_runtime *rtd)
		{
		int ret;

		ret = first_spk_init(rtd);
		if (ret)
		return ret;

		return second_spk_init(rtd);
		}

		int sof_sdw_rt1316_init(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++;
		if (info->amp_num == 1)
		dai_links->init = first_spk_init;

		if (info->amp_num == 2) {
		/*
		* if two 1316s are in one dai link, the init function
		* in this dai link will be first set for the first speaker,
		* and it should be reset to initialize all speakers when
		* the second speaker is found.
		*/
		if (dai_links->init)
		dai_links->init = all_spk_init;
		else
		dai_links->init = second_spk_init;
		}

		return 0;
		}

Admin message