ASoC: intel: sof_rt5682: Add support for tgl_rt1011_rt5682
Subsystems (3)
PATCH 1/1 ASoC: intel: sof_rt5682: Add support for tgl_rt1011_rt5682
This patch adds the driver data for two rt1011 speaker amplifiers on SSP1 and rt5682 on SSP0 for TGL platform. DAI format for rt1011 is leveraged from cml_rt1011_rt5682 which is 4-slot tdm with 100fs bclk.
Signed-off-by Brent Lu <[email protected]>
--- sound/soc/intel/boards/Kconfig | 1 + sound/soc/intel/boards/Makefile | 2 +- sound/soc/intel/boards/sof_realtek_common.c | 137 ++++++++++++++++++ sound/soc/intel/boards/sof_realtek_common.h | 24 +++ sound/soc/intel/boards/sof_rt5682.c | 26 +++- .../intel/common/soc-acpi-intel-tgl-match.c | 13 ++ 6 files changed, 198 insertions(+), 5 deletions(-) create mode 100644 sound/soc/intel/boards/sof_realtek_common.c create mode 100644 sound/soc/intel/boards/sof_realtek_common.h
sound/soc/intel/boards/Kconfig +1 -0
@@ -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
@@ -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 new file +137 -0
137 lines not on this page · raw message
sound/soc/intel/boards/sof_realtek_common.h new file +24 -0
@@ -0,0 +1,24 @@ +/* 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
@@ -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 <[email protected]>" );MODULE_AUTHOR ("Sathya Prakash M R <[email protected]>" ); +MODULE_AUTHOR ("Brent Lu <[email protected]>" );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" );
sound/soc/intel/common/soc-acpi-intel-tgl-match.c +13 -0
@@ -310,6 +310,11 @@ static struct snd_soc_acpi_codecs tgl_max98373_amp = { .codecs = {"MX98373"} }; +static struct snd_soc_acpi_codecs tgl_rt1011_amp = { + .num_codecs =1 , + .codecs = {"10EC1011" } +}; +struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_machines[] = { { .id ="10EC1308" ,
@@ -335,6 +340,14 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_machines[] = { .sof_fw_filename = "sof-tgl.ri", .sof_tplg_filename = "sof-tgl-max98373-rt5682.tplg", }, + { + .id = "10EC5682", + .drv_name = "tgl_rt1011_rt5682", + .machine_quirk = snd_soc_acpi_codec_list, + .quirk_data = &tgl_rt1011_amp, + .sof_fw_filename = "sof-tgl.ri", + .sof_tplg_filename = "sof-tgl-rt1011-rt5682.tplg", + }, {}, };EXPORT_SYMBOL_GPL (snd_soc_acpi_intel_tgl_machines);
Signature · 1 line
2.17.1
sound/soc/intel/boards/sof_realtek_common.c line 61
Quoted 8 lines
sound/soc/intel/boards/sof_realtek_common.c new file +7
-0+struct { +unsigned int tx; +unsigned int rx; +} rt1011_tdm_mask[] = { + {.tx =0x4 , .rx =0x1 }, + {.tx =0x8 , .rx =0x2 }, +};
as noted in the GitHub review this should be static and possibly const.
Quoted 9 lines
sound/soc/intel/boards/sof_realtek_common.c line 61
Quoted 7 lines
sound/soc/intel/boards/sof_realtek_common.c new file +7
-0+struct { +unsigned int tx; +unsigned int rx; +} rt1011_tdm_mask[] = { + {.tx =0x4 , .rx =0x1 }, + {.tx =0x8 , .rx =0x2 }, +};as noted in the GitHub review this should be static and possibly const.
Will fix in v2. Also add const to structures in soc-acpi-intel-tgl-match.c and include file in sof_realtek_common.c
Regards,
Brent