ASoC: intel: sof_rt5682: Add support for tgl_rt1011_rt5682 (aa6cc97c) · Commits · 戴 / test

sound/soc/intel/boards/Kconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -443,6 +443,7 @@ config SND_SOC_INTEL_SOF_RT5682_MACH
		(MFD_INTEL_LPSS \|\| COMPILE_TEST)) \|\|\
		(SND_SOC_SOF_BAYTRAIL && (X86_INTEL_LPSS \|\| COMPILE_TEST))
		select SND_SOC_MAX98373_I2C
		select SND_SOC_RT1011
		select SND_SOC_RT1015
		select SND_SOC_RT5682_I2C
		select SND_SOC_DMIC

sound/soc/intel/boards/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@ snd-soc-sst-byt-cht-cx2072x-objs := bytcht_cx2072x.o
		snd-soc-sst-byt-cht-da7213-objs := bytcht_da7213.o
		snd-soc-sst-byt-cht-es8316-objs := bytcht_es8316.o
		snd-soc-sst-byt-cht-nocodec-objs := bytcht_nocodec.o
		snd-soc-sof_rt5682-objs := sof_rt5682.o hda_dsp_common.o sof_maxim_common.o
		snd-soc-sof_rt5682-objs := sof_rt5682.o hda_dsp_common.o sof_maxim_common.o sof_realtek_common.o
		snd-soc-cml_rt1011_rt5682-objs := cml_rt1011_rt5682.o hda_dsp_common.o
		snd-soc-kbl_da7219_max98357a-objs := kbl_da7219_max98357a.o
		snd-soc-kbl_da7219_max98927-objs := kbl_da7219_max98927.o

sound/soc/intel/boards/sof_realtek_common.c

0 → 100644

+138 −0

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

		#include <linux/device.h>
		#include <linux/kernel.h>
		#include <sound/pcm.h>
		#include <sound/pcm_params.h>
		#include <sound/soc.h>
		#include <sound/soc-dai.h>
		#include <sound/soc-dapm.h>
		#include <uapi/sound/asound.h>
		#include "../../codecs/rt1011.h"
		#include "sof_realtek_common.h"

		/*
		* Current only 2-amp configuration is supported for rt1011
		*/
		static const struct snd_soc_dapm_route rt1011_dapm_routes[] = {
		/* speaker */
		{ "Left Spk", NULL, "Left SPO" },
		{ "Right Spk", NULL, "Right SPO" },
		};

		/*
		* Make sure device's Unique ID follows this configuration:
		*
		* Two speakers:
		* 0: left, 1: right
		* Four speakers:
		* 0: Woofer left, 1: Woofer right
		* 2: Tweeter left, 3: Tweeter right
		*/
		static struct snd_soc_codec_conf rt1011_codec_confs[] = {
		{
		.dlc = COMP_CODEC_CONF(RT1011_DEV0_NAME),
		.name_prefix = "Left",
		},
		{
		.dlc = COMP_CODEC_CONF(RT1011_DEV1_NAME),
		.name_prefix = "Right",
		},
		};

		static struct snd_soc_dai_link_component rt1011_dai_link_components[] = {
		{
		.name = RT1011_DEV0_NAME,
		.dai_name = RT1011_CODEC_DAI,
		},
		{
		.name = RT1011_DEV1_NAME,
		.dai_name = RT1011_CODEC_DAI,
		},
		};

		static const struct {
		unsigned int tx;
		unsigned int rx;
		} rt1011_tdm_mask[] = {
		{.tx = 0x4, .rx = 0x1},
		{.tx = 0x8, .rx = 0x2},
		};

		static int rt1011_hw_params(struct snd_pcm_substream *substream,
		struct snd_pcm_hw_params *params)
		{
		struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
		struct snd_soc_dai *codec_dai;
		int srate, i, ret = 0;

		srate = params_rate(params);

		for_each_rtd_codec_dais(rtd, i, codec_dai) {
		/* 100 Fs to drive 24 bit data */
		ret = snd_soc_dai_set_pll(codec_dai, 0, RT1011_PLL1_S_BCLK,
		100 * srate, 256 * srate);
		if (ret < 0) {
		dev_err(codec_dai->dev, "fail to set pll, ret %d\n",
		ret);
		return ret;
		}

		ret = snd_soc_dai_set_sysclk(codec_dai, RT1011_FS_SYS_PRE_S_PLL1,
		256 * srate, SND_SOC_CLOCK_IN);
		if (ret < 0) {
		dev_err(codec_dai->dev, "fail to set sysclk, ret %d\n",
		ret);
		return ret;
		}

		if (i >= ARRAY_SIZE(rt1011_tdm_mask)) {
		dev_err(codec_dai->dev, "invalid codec index %d\n",
		i);
		return -ENODEV;
		}

		ret = snd_soc_dai_set_tdm_slot(codec_dai, rt1011_tdm_mask[i].tx,
		rt1011_tdm_mask[i].rx, 4,
		params_width(params));
		if (ret < 0) {
		dev_err(codec_dai->dev, "fail to set tdm slot, ret %d\n",
		ret);
		return ret;
		}
		}

		return 0;
		}

		static const struct snd_soc_ops rt1011_ops = {
		.hw_params = rt1011_hw_params,
		};

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

		ret = snd_soc_dapm_add_routes(&card->dapm, rt1011_dapm_routes,
		ARRAY_SIZE(rt1011_dapm_routes));
		if (ret)
		dev_err(rtd->dev, "Speaker map addition failed: %d\n", ret);
		return ret;
		}

		void sof_rt1011_dai_link(struct snd_soc_dai_link *link)
		{
		link->codecs = rt1011_dai_link_components;
		link->num_codecs = ARRAY_SIZE(rt1011_dai_link_components);
		link->init = rt1011_init;
		link->ops = &rt1011_ops;
		}

		void sof_rt1011_codec_conf(struct snd_soc_card *card)
		{
		card->codec_conf = rt1011_codec_confs;
		card->num_configs = ARRAY_SIZE(rt1011_codec_confs);
		}

sound/soc/intel/boards/sof_realtek_common.h

0 → 100644

+24 −0

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

		/*
		* This file defines data structures used in Machine Driver for Intel
		* platforms with Realtek Codecs.
		*/
		#ifndef __SOF_REALTEK_COMMON_H
		#define __SOF_REALTEK_COMMON_H

		#include <sound/soc.h>

		#define RT1011_CODEC_DAI "rt1011-aif"
		#define RT1011_DEV0_NAME "i2c-10EC1011:00"
		#define RT1011_DEV1_NAME "i2c-10EC1011:01"
		#define RT1011_DEV2_NAME "i2c-10EC1011:02"
		#define RT1011_DEV3_NAME "i2c-10EC1011:03"

		void sof_rt1011_dai_link(struct snd_soc_dai_link *link);
		void sof_rt1011_codec_conf(struct snd_soc_card *card);

		#endif /* __SOF_REALTEK_COMMON_H */

sound/soc/intel/boards/sof_rt5682.c

+22 −4

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@
		#include "../common/soc-intel-quirks.h"
		#include "hda_dsp_common.h"
		#include "sof_maxim_common.h"
		#include "sof_realtek_common.h"

		#define NAME_SIZE 32

		@@ -41,10 +42,11 @@
		#define SOF_RT5682_NUM_HDMIDEV_MASK (GENMASK(12, 10))
		#define SOF_RT5682_NUM_HDMIDEV(quirk) \
		((quirk << SOF_RT5682_NUM_HDMIDEV_SHIFT) & SOF_RT5682_NUM_HDMIDEV_MASK)
		#define SOF_RT1015_SPEAKER_AMP_PRESENT BIT(13)
		#define SOF_RT1015_SPEAKER_AMP_100FS BIT(14)
		#define SOF_MAX98373_SPEAKER_AMP_PRESENT BIT(15)
		#define SOF_MAX98360A_SPEAKER_AMP_PRESENT BIT(16)
		#define SOF_RT1011_SPEAKER_AMP_PRESENT BIT(13)
		#define SOF_RT1015_SPEAKER_AMP_PRESENT BIT(14)
		#define SOF_RT1015_SPEAKER_AMP_100FS BIT(15)
		#define SOF_MAX98373_SPEAKER_AMP_PRESENT BIT(16)
		#define SOF_MAX98360A_SPEAKER_AMP_PRESENT BIT(17)

		/* Default: MCLK on, MCLK 19.2M, SSP0 */
		static unsigned long sof_rt5682_quirk = SOF_RT5682_MCLK_EN \|
		@@ -741,6 +743,9 @@ static struct snd_soc_dai_link sof_card_dai_links_create(struct device dev,
		links[id].codecs = max98360a_component;
		links[id].num_codecs = ARRAY_SIZE(max98360a_component);
		links[id].init = speaker_codec_init;
		} else if (sof_rt5682_quirk &
		SOF_RT1011_SPEAKER_AMP_PRESENT) {
		sof_rt1011_dai_link(&links[id]);
		} else {
		links[id].codecs = max98357a_component;
		links[id].num_codecs = ARRAY_SIZE(max98357a_component);
		@@ -851,6 +856,8 @@ static int sof_audio_probe(struct platform_device *pdev)

		if (sof_rt5682_quirk & SOF_MAX98373_SPEAKER_AMP_PRESENT)
		sof_max98373_codec_conf(&sof_audio_card_rt5682);
		else if (sof_rt5682_quirk & SOF_RT1011_SPEAKER_AMP_PRESENT)
		sof_rt1011_codec_conf(&sof_audio_card_rt5682);

		dai_links = sof_card_dai_links_create(&pdev->dev, ssp_codec, ssp_amp,
		dmic_be_num, hdmi_num);
		@@ -931,6 +938,15 @@ static const struct platform_device_id board_ids[] = {
		SOF_RT1015_SPEAKER_AMP_100FS \|
		SOF_RT5682_SSP_AMP(1)),
		},
		{
		.name = "tgl_rt1011_rt5682",
		.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN \|
		SOF_RT5682_SSP_CODEC(0) \|
		SOF_SPEAKER_AMP_PRESENT \|
		SOF_RT1011_SPEAKER_AMP_PRESENT \|
		SOF_RT5682_SSP_AMP(1) \|
		SOF_RT5682_NUM_HDMIDEV(4)),
		},
		{ }
		};

		@@ -948,6 +964,7 @@ module_platform_driver(sof_audio)
		MODULE_DESCRIPTION("SOF Audio Machine driver");
		MODULE_AUTHOR("Bard Liao <bard.liao@intel.com>");
		MODULE_AUTHOR("Sathya Prakash M R <sathya.prakash.m.r@intel.com>");
		MODULE_AUTHOR("Brent Lu <brent.lu@intel.com>");
		MODULE_LICENSE("GPL v2");
		MODULE_ALIAS("platform:sof_rt5682");
		MODULE_ALIAS("platform:tgl_max98357a_rt5682");
		@@ -955,3 +972,4 @@ MODULE_ALIAS("platform:jsl_rt5682_rt1015");
		MODULE_ALIAS("platform:tgl_max98373_rt5682");
		MODULE_ALIAS("platform:jsl_rt5682_max98360a");
		MODULE_ALIAS("platform:cml_rt1015_rt5682");
		MODULE_ALIAS("platform:tgl_rt1011_rt5682");

Admin message