iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge series "ASoC: Intel: sof_sdw: Use fixed DAI link id" from Bard Liao <yung-chuan.liao@linux.intel.com>:

Browse Source 
This series provides a way to use constant dailink numbers for different
devices. So that we don't need to renumber them in topologies.
Some patches with different purpose are sent together in this series
since they are dependent.

Bard Liao (8):
  ASoC: intel: sof_sdw: return the original error number
  ASoC: intel: sof_sdw: rename be_index/link_id to link_index
  ASoC: intel: sof_sdw: Use a fixed DAI link id for AMP
  ASoC: intel: sof_sdw: move DMIC link id overwrite to
    create_sdw_dailink
  ASoC: intel: sof_sdw: remove SOF_RT715_DAI_ID_FIX quirk
  ASoC: intel: sof_sdw: remove sof_sdw_mic_codec_mockup_init
  ASoC: intel: sof_sdw: remove get_next_be_id
  ASoC: intel: sof_sdw: add link adr order check

Pierre-Louis Bossart (2):
  ASoC: Intel: sof_sdw: fix jack detection on HP Spectre x360
    convertible
  ASoC: Intel: sof_sdw: add SKU for Dell Latitude 9520

 sound/soc/intel/boards/sof_sdw.c            | 152 ++++++++++----------
 sound/soc/intel/boards/sof_sdw_common.h     |   7 +-
 sound/soc/intel/boards/sof_sdw_rt715.c      |   7 -
 sound/soc/intel/boards/sof_sdw_rt715_sdca.c |   7 -
 4 files changed, 85 insertions(+), 88 deletions(-)

--
2.17.1
This commit is contained in:
Mark Brown
2021-11-15 19:23:56 +00:00
parent a4832f8027 296c789ce1
commit 0c61ac2786
4 changed files with 85 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

152
sound/soc/intel/boards/sof_sdw.c
View File

@@ -36,8 +36,6 @@ static void log_quirks(struct device *dev)
if (SOF_SSP_GET_PORT(sof_sdw_quirk)) if (SOF_SSP_GET_PORT(sof_sdw_quirk))
dev_dbg(dev, "SSP port %ld\n", dev_dbg(dev, "SSP port %ld\n",
SOF_SSP_GET_PORT(sof_sdw_quirk)); SOF_SSP_GET_PORT(sof_sdw_quirk));
if (sof_sdw_quirk & SOF_RT715_DAI_ID_FIX)
dev_dbg(dev, "quirk SOF_RT715_DAI_ID_FIX enabled\n");
if (sof_sdw_quirk & SOF_SDW_NO_AGGREGATION) if (sof_sdw_quirk & SOF_SDW_NO_AGGREGATION)
dev_dbg(dev, "quirk SOF_SDW_NO_AGGREGATION enabled\n"); dev_dbg(dev, "quirk SOF_SDW_NO_AGGREGATION enabled\n");
} }
@@ -64,8 +62,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"), DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),
DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "09C6") DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "09C6")
}, },
.driver_data = (void *)(RT711_JD2 | .driver_data = (void *)RT711_JD2,
SOF_RT715_DAI_ID_FIX),
}, },
{ {
/* early version of SKU 09C6 */ /* early version of SKU 09C6 */
@@ -74,8 +71,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"), DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),
DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0983") DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0983")
}, },
.driver_data = (void *)(RT711_JD2 | .driver_data = (void *)RT711_JD2,
SOF_RT715_DAI_ID_FIX),
}, },
{ {
.callback = sof_sdw_quirk_cb, .callback = sof_sdw_quirk_cb,
@@ -84,7 +80,6 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "098F"), DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "098F"),
}, },
.driver_data = (void *)(RT711_JD2 | .driver_data = (void *)(RT711_JD2 |
SOF_RT715_DAI_ID_FIX |
SOF_SDW_FOUR_SPK), SOF_SDW_FOUR_SPK),
}, },
{ {
@@ -94,7 +89,6 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0990"), DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0990"),
}, },
.driver_data = (void *)(RT711_JD2 | .driver_data = (void *)(RT711_JD2 |
SOF_RT715_DAI_ID_FIX |
SOF_SDW_FOUR_SPK), SOF_SDW_FOUR_SPK),
}, },
/* IceLake devices */ /* IceLake devices */
@@ -126,8 +120,17 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0A3E") DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0A3E")
}, },
.driver_data = (void *)(SOF_SDW_TGL_HDMI | .driver_data = (void *)(SOF_SDW_TGL_HDMI |
RT711_JD2 | RT711_JD2),
SOF_RT715_DAI_ID_FIX), },
{
/* another SKU of Dell Latitude 9520 */
.callback = sof_sdw_quirk_cb,
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),
DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0A3F")
},
.driver_data = (void *)(SOF_SDW_TGL_HDMI |
RT711_JD2),
}, },
{ {
/* Dell XPS 9710 */ /* Dell XPS 9710 */
@@ -138,7 +141,6 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
}, },
.driver_data = (void *)(SOF_SDW_TGL_HDMI | .driver_data = (void *)(SOF_SDW_TGL_HDMI |
RT711_JD2 | RT711_JD2 |
SOF_RT715_DAI_ID_FIX |
SOF_SDW_FOUR_SPK), SOF_SDW_FOUR_SPK),
}, },
{ {
@@ -149,7 +151,6 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
}, },
.driver_data = (void *)(SOF_SDW_TGL_HDMI | .driver_data = (void *)(SOF_SDW_TGL_HDMI |
RT711_JD2 | RT711_JD2 |
SOF_RT715_DAI_ID_FIX |
SOF_SDW_FOUR_SPK), SOF_SDW_FOUR_SPK),
}, },
{ {
@@ -188,7 +189,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
}, },
.driver_data = (void *)(SOF_SDW_TGL_HDMI | .driver_data = (void *)(SOF_SDW_TGL_HDMI |
SOF_SDW_PCH_DMIC | SOF_SDW_PCH_DMIC |
RT711_JD2), RT711_JD1),
}, },
{ {
/* NUC15 'Bishop County' LAPBC510 and LAPBC710 skews */ /* NUC15 'Bishop County' LAPBC510 and LAPBC710 skews */
@@ -210,7 +211,6 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
}, },
.driver_data = (void *)(SOF_SDW_TGL_HDMI | .driver_data = (void *)(SOF_SDW_TGL_HDMI |
RT711_JD2 | RT711_JD2 |
SOF_RT715_DAI_ID_FIX |
SOF_SDW_FOUR_SPK), SOF_SDW_FOUR_SPK),
}, },
{ {
@@ -220,8 +220,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0A45") DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0A45")
}, },
.driver_data = (void *)(SOF_SDW_TGL_HDMI | .driver_data = (void *)(SOF_SDW_TGL_HDMI |
RT711_JD2 | RT711_JD2),
SOF_RT715_DAI_ID_FIX),
}, },
/* AlderLake devices */ /* AlderLake devices */
{ {
@@ -232,7 +231,6 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
}, },
.driver_data = (void *)(RT711_JD2_100K | .driver_data = (void *)(RT711_JD2_100K |
SOF_SDW_TGL_HDMI | SOF_SDW_TGL_HDMI |
SOF_RT715_DAI_ID_FIX |
SOF_BT_OFFLOAD_SSP(2) | SOF_BT_OFFLOAD_SSP(2) |
SOF_SSP_BT_OFFLOAD_PRESENT), SOF_SSP_BT_OFFLOAD_PRESENT),
}, },
@@ -431,26 +429,13 @@ static const struct snd_soc_ops sdw_ops = {
.shutdown = sdw_shutdown, .shutdown = sdw_shutdown,
}; };
static int sof_sdw_mic_codec_mockup_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)
{
/*
* force DAI link to use same ID as RT715 and DMIC
* to reuse topologies
*/
dai_links->id = SDW_DMIC_DAI_ID;
return 0;
}
static struct sof_sdw_codec_info codec_info_list[] = { static struct sof_sdw_codec_info codec_info_list[] = {
{ {
.part_id = 0x700, .part_id = 0x700,
.direction = {true, true}, .direction = {true, true},
.dai_name = "rt700-aif1", .dai_name = "rt700-aif1",
.init = sof_sdw_rt700_init, .init = sof_sdw_rt700_init,
.codec_type = SOF_SDW_CODEC_TYPE_JACK,
}, },
{ {
.part_id = 0x711, .part_id = 0x711,
@@ -459,6 +444,7 @@ static struct sof_sdw_codec_info codec_info_list[] = {
.dai_name = "rt711-sdca-aif1", .dai_name = "rt711-sdca-aif1",
.init = sof_sdw_rt711_sdca_init, .init = sof_sdw_rt711_sdca_init,
.exit = sof_sdw_rt711_sdca_exit, .exit = sof_sdw_rt711_sdca_exit,
.codec_type = SOF_SDW_CODEC_TYPE_JACK,
}, },
{ {
.part_id = 0x711, .part_id = 0x711,
@@ -467,6 +453,7 @@ static struct sof_sdw_codec_info codec_info_list[] = {
.dai_name = "rt711-aif1", .dai_name = "rt711-aif1",
.init = sof_sdw_rt711_init, .init = sof_sdw_rt711_init,
.exit = sof_sdw_rt711_exit, .exit = sof_sdw_rt711_exit,
.codec_type = SOF_SDW_CODEC_TYPE_JACK,
}, },
{ {
.part_id = 0x1308, .part_id = 0x1308,
@@ -475,12 +462,14 @@ static struct sof_sdw_codec_info codec_info_list[] = {
.dai_name = "rt1308-aif", .dai_name = "rt1308-aif",
.ops = &sof_sdw_rt1308_i2s_ops, .ops = &sof_sdw_rt1308_i2s_ops,
.init = sof_sdw_rt1308_init, .init = sof_sdw_rt1308_init,
.codec_type = SOF_SDW_CODEC_TYPE_AMP,
}, },
{ {
.part_id = 0x1316, .part_id = 0x1316,
.direction = {true, true}, .direction = {true, true},
.dai_name = "rt1316-aif", .dai_name = "rt1316-aif",
.init = sof_sdw_rt1316_init, .init = sof_sdw_rt1316_init,
.codec_type = SOF_SDW_CODEC_TYPE_AMP,
}, },
{ {
.part_id = 0x714, .part_id = 0x714,
@@ -489,6 +478,7 @@ static struct sof_sdw_codec_info codec_info_list[] = {
.ignore_pch_dmic = true, .ignore_pch_dmic = true,
.dai_name = "rt715-aif2", .dai_name = "rt715-aif2",
.init = sof_sdw_rt715_sdca_init, .init = sof_sdw_rt715_sdca_init,
.codec_type = SOF_SDW_CODEC_TYPE_MIC,
}, },
{ {
.part_id = 0x715, .part_id = 0x715,
@@ -497,6 +487,7 @@ static struct sof_sdw_codec_info codec_info_list[] = {
.ignore_pch_dmic = true, .ignore_pch_dmic = true,
.dai_name = "rt715-aif2", .dai_name = "rt715-aif2",
.init = sof_sdw_rt715_sdca_init, .init = sof_sdw_rt715_sdca_init,
.codec_type = SOF_SDW_CODEC_TYPE_MIC,
}, },
{ {
.part_id = 0x714, .part_id = 0x714,
@@ -505,6 +496,7 @@ static struct sof_sdw_codec_info codec_info_list[] = {
.ignore_pch_dmic = true, .ignore_pch_dmic = true,
.dai_name = "rt715-aif2", .dai_name = "rt715-aif2",
.init = sof_sdw_rt715_init, .init = sof_sdw_rt715_init,
.codec_type = SOF_SDW_CODEC_TYPE_MIC,
}, },
{ {
.part_id = 0x715, .part_id = 0x715,
@@ -513,6 +505,7 @@ static struct sof_sdw_codec_info codec_info_list[] = {
.ignore_pch_dmic = true, .ignore_pch_dmic = true,
.dai_name = "rt715-aif2", .dai_name = "rt715-aif2",
.init = sof_sdw_rt715_init, .init = sof_sdw_rt715_init,
.codec_type = SOF_SDW_CODEC_TYPE_MIC,
}, },
{ {
.part_id = 0x8373, .part_id = 0x8373,
@@ -520,12 +513,14 @@ static struct sof_sdw_codec_info codec_info_list[] = {
.dai_name = "max98373-aif1", .dai_name = "max98373-aif1",
.init = sof_sdw_mx8373_init, .init = sof_sdw_mx8373_init,
.codec_card_late_probe = sof_sdw_mx8373_late_probe, .codec_card_late_probe = sof_sdw_mx8373_late_probe,
.codec_type = SOF_SDW_CODEC_TYPE_AMP,
}, },
{ {
.part_id = 0x5682, .part_id = 0x5682,
.direction = {true, true}, .direction = {true, true},
.dai_name = "rt5682-sdw", .dai_name = "rt5682-sdw",
.init = sof_sdw_rt5682_init, .init = sof_sdw_rt5682_init,
.codec_type = SOF_SDW_CODEC_TYPE_JACK,
}, },
{ {
.part_id = 0xaaaa, /* generic codec mockup */ .part_id = 0xaaaa, /* generic codec mockup */
@@ -533,6 +528,7 @@ static struct sof_sdw_codec_info codec_info_list[] = {
.direction = {true, true}, .direction = {true, true},
.dai_name = "sdw-mockup-aif1", .dai_name = "sdw-mockup-aif1",
.init = NULL, .init = NULL,
.codec_type = SOF_SDW_CODEC_TYPE_JACK,
}, },
{ {
.part_id = 0xaa55, /* headset codec mockup */ .part_id = 0xaa55, /* headset codec mockup */
@@ -540,6 +536,7 @@ static struct sof_sdw_codec_info codec_info_list[] = {
.direction = {true, true}, .direction = {true, true},
.dai_name = "sdw-mockup-aif1", .dai_name = "sdw-mockup-aif1",
.init = NULL, .init = NULL,
.codec_type = SOF_SDW_CODEC_TYPE_JACK,
}, },
{ {
.part_id = 0x55aa, /* amplifier mockup */ .part_id = 0x55aa, /* amplifier mockup */
@@ -547,13 +544,14 @@ static struct sof_sdw_codec_info codec_info_list[] = {
.direction = {true, false}, .direction = {true, false},
.dai_name = "sdw-mockup-aif1", .dai_name = "sdw-mockup-aif1",
.init = NULL, .init = NULL,
.codec_type = SOF_SDW_CODEC_TYPE_AMP,
}, },
{ {
.part_id = 0x5555, .part_id = 0x5555,
.version_id = 0, .version_id = 0,
.direction = {false, true}, .direction = {false, true},
.dai_name = "sdw-mockup-aif1", .dai_name = "sdw-mockup-aif1",
.init = sof_sdw_mic_codec_mockup_init, .codec_type = SOF_SDW_CODEC_TYPE_MIC,
}, },
}; };
@@ -601,10 +599,11 @@ static inline int find_codec_info_acpi(const u8 *acpi_id)
* Since some sdw slaves may be aggregated, the CPU DAI number * Since some sdw slaves may be aggregated, the CPU DAI number
* may be larger than the number of BE dailinks. * may be larger than the number of BE dailinks.
*/ */
static int get_sdw_dailink_info(const struct snd_soc_acpi_link_adr *links, static int get_sdw_dailink_info(struct device *dev, const struct snd_soc_acpi_link_adr *links,
int *sdw_be_num, int *sdw_cpu_dai_num) int *sdw_be_num, int *sdw_cpu_dai_num)
{ {
const struct snd_soc_acpi_link_adr *link; const struct snd_soc_acpi_link_adr *link;
int _codec_type = SOF_SDW_CODEC_TYPE_JACK;
bool group_visited[SDW_MAX_GROUPS]; bool group_visited[SDW_MAX_GROUPS];
bool no_aggregation; bool no_aggregation;
int i; int i;
@@ -630,6 +629,12 @@ static int get_sdw_dailink_info(const struct snd_soc_acpi_link_adr *links,
if (codec_index < 0) if (codec_index < 0)
return codec_index; return codec_index;
if (codec_info_list[codec_index].codec_type < _codec_type)
dev_warn(dev,
"Unexpected address table ordering. Expected order: jack -> amp -> mic\n");
_codec_type = codec_info_list[codec_index].codec_type;
endpoint = link->adr_d->endpoints; endpoint = link->adr_d->endpoints;
/* count DAI number for playback and capture */ /* count DAI number for playback and capture */
@@ -888,14 +893,14 @@ static int get_slave_info(const struct snd_soc_acpi_link_adr *adr_link,
} }
static int create_sdw_dailink(struct snd_soc_card *card, static int create_sdw_dailink(struct snd_soc_card *card,
struct device *dev, int *be_index, struct device *dev, int *link_index,
struct snd_soc_dai_link *dai_links, struct snd_soc_dai_link *dai_links,
int sdw_be_num, int sdw_cpu_dai_num, int sdw_be_num, int sdw_cpu_dai_num,
struct snd_soc_dai_link_component *cpus, struct snd_soc_dai_link_component *cpus,
const struct snd_soc_acpi_link_adr *link, const struct snd_soc_acpi_link_adr *link,
int *cpu_id, bool *group_generated, int *cpu_id, bool *group_generated,
struct snd_soc_codec_conf *codec_conf, struct snd_soc_codec_conf *codec_conf,
int codec_count, int codec_count, int *link_id,
int *codec_conf_index, int *codec_conf_index,
bool *ignore_pch_dmic) bool *ignore_pch_dmic)
{ {
@@ -953,6 +958,19 @@ static int create_sdw_dailink(struct snd_soc_card *card,
if (codec_info_list[codec_index].ignore_pch_dmic) if (codec_info_list[codec_index].ignore_pch_dmic)
*ignore_pch_dmic = true; *ignore_pch_dmic = true;
/* Shift the first amplifier's *link_id to SDW_AMP_DAI_ID */
if (codec_info_list[codec_index].codec_type == SOF_SDW_CODEC_TYPE_AMP &&
*link_id < SDW_AMP_DAI_ID)
*link_id = SDW_AMP_DAI_ID;
/*
* DAI ID is fixed at SDW_DMIC_DAI_ID for MICs to
* keep sdw DMIC and HDMI setting static in UCM
*/
if (codec_info_list[codec_index].codec_type == SOF_SDW_CODEC_TYPE_MIC &&
*link_id < SDW_DMIC_DAI_ID)
*link_id = SDW_DMIC_DAI_ID;
cpu_dai_index = *cpu_id; cpu_dai_index = *cpu_id;
for_each_pcm_streams(stream) { for_each_pcm_streams(stream) {
char *name, *cpu_name; char *name, *cpu_name;
@@ -991,8 +1009,12 @@ static int create_sdw_dailink(struct snd_soc_card *card,
cpus[cpu_dai_index++].dai_name = cpu_name; cpus[cpu_dai_index++].dai_name = cpu_name;
} }
if (*be_index >= sdw_be_num) { /*
dev_err(dev, " invalid be dai index %d", *be_index); * We create sdw dai links at first stage, so link index should
* not be larger than sdw_be_num
*/
if (*link_index >= sdw_be_num) {
dev_err(dev, "invalid dai link index %d", *link_index);
return -EINVAL; return -EINVAL;
} }
@@ -1003,18 +1025,19 @@ static int create_sdw_dailink(struct snd_soc_card *card,
playback = (stream == SNDRV_PCM_STREAM_PLAYBACK); playback = (stream == SNDRV_PCM_STREAM_PLAYBACK);
capture = (stream == SNDRV_PCM_STREAM_CAPTURE); capture = (stream == SNDRV_PCM_STREAM_CAPTURE);
init_dai_link(dev, dai_links + *be_index, *be_index, name, init_dai_link(dev, dai_links + *link_index, (*link_id)++, name,
playback, capture, playback, capture,
cpus + *cpu_id, cpu_dai_num, cpus + *cpu_id, cpu_dai_num,
codecs, codec_num, codecs, codec_num,
NULL, &sdw_ops); NULL, &sdw_ops);
/* /*
* SoundWire DAILINKs use 'stream' functions and Bank Switch operations * SoundWire DAILINKs use 'stream' functions and Bank Switch operations
* based on wait_for_completion(), tag them as 'nonatomic'. * based on wait_for_completion(), tag them as 'nonatomic'.
*/ */
dai_links[*be_index].nonatomic = true; dai_links[*link_index].nonatomic = true;
ret = set_codec_init_func(card, link, dai_links + (*be_index)++, ret = set_codec_init_func(card, link, dai_links + (*link_index)++,
playback, group_id); playback, group_id);
if (ret < 0) { if (ret < 0) {
dev_err(dev, "failed to init codec %d", codec_index); dev_err(dev, "failed to init codec %d", codec_index);
@@ -1028,17 +1051,6 @@ static int create_sdw_dailink(struct snd_soc_card *card,
return 0; return 0;
} }
/*
* DAI link ID of SSP & DMIC & HDMI are based on last
* link ID used by sdw link. Since be_id may be changed
* in init func of sdw codec, it is not equal to be_id
*/
static inline int get_next_be_id(struct snd_soc_dai_link *links,
int be_id)
{
return links[be_id - 1].id + 1;
}
#define IDISP_CODEC_MASK 0x4 #define IDISP_CODEC_MASK 0x4
static int sof_card_codec_conf_alloc(struct device *dev, static int sof_card_codec_conf_alloc(struct device *dev,
@@ -1095,7 +1107,7 @@ static int sof_card_dai_links_create(struct device *dev,
bool group_generated[SDW_MAX_GROUPS]; bool group_generated[SDW_MAX_GROUPS];
int ssp_codec_index, ssp_mask; int ssp_codec_index, ssp_mask;
struct snd_soc_dai_link *links; struct snd_soc_dai_link *links;
int num_links, link_id = 0; int num_links, link_index = 0;
char *name, *cpu_name; char *name, *cpu_name;
int total_cpu_dai_num; int total_cpu_dai_num;
int sdw_cpu_dai_num; int sdw_cpu_dai_num;
@@ -1131,7 +1143,7 @@ static int sof_card_dai_links_create(struct device *dev,
ssp_num = ssp_codec_index >= 0 ? hweight_long(ssp_mask) : 0; ssp_num = ssp_codec_index >= 0 ? hweight_long(ssp_mask) : 0;
comp_num = hdmi_num + ssp_num; comp_num = hdmi_num + ssp_num;
ret = get_sdw_dailink_info(mach_params->links, ret = get_sdw_dailink_info(dev, mach_params->links,
&sdw_be_num, &sdw_cpu_dai_num); &sdw_be_num, &sdw_cpu_dai_num);
if (ret < 0) { if (ret < 0) {
dev_err(dev, "failed to get sdw link info %d", ret); dev_err(dev, "failed to get sdw link info %d", ret);
@@ -1195,24 +1207,18 @@ static int sof_card_dai_links_create(struct device *dev,
group_generated[endpoint->group_id]) group_generated[endpoint->group_id])
continue; continue;
ret = create_sdw_dailink(card, dev, &be_id, links, sdw_be_num, ret = create_sdw_dailink(card, dev, &link_index, links, sdw_be_num,
sdw_cpu_dai_num, cpus, adr_link, sdw_cpu_dai_num, cpus, adr_link,
&cpu_id, group_generated, &cpu_id, group_generated,
codec_conf, codec_conf_count, codec_conf, codec_conf_count,
&codec_conf_index, &be_id, &codec_conf_index,
&ignore_pch_dmic); &ignore_pch_dmic);
if (ret < 0) { if (ret < 0) {
dev_err(dev, "failed to create dai link %d", be_id); dev_err(dev, "failed to create dai link %d", link_index);
return -ENOMEM; return ret;
} }
} }
/* non-sdw DAI follows sdw DAI */
link_id = be_id;
/* get BE ID for non-sdw DAI */
be_id = get_next_be_id(links, be_id);
SSP: SSP:
/* SSP */ /* SSP */
if (!ssp_num) if (!ssp_num)
@@ -1252,17 +1258,17 @@ SSP:
playback = info->direction[SNDRV_PCM_STREAM_PLAYBACK]; playback = info->direction[SNDRV_PCM_STREAM_PLAYBACK];
capture = info->direction[SNDRV_PCM_STREAM_CAPTURE]; capture = info->direction[SNDRV_PCM_STREAM_CAPTURE];
init_dai_link(dev, links + link_id, be_id, name, init_dai_link(dev, links + link_index, be_id, name,
playback, capture, playback, capture,
cpus + cpu_id, 1, cpus + cpu_id, 1,
ssp_components, 1, ssp_components, 1,
NULL, info->ops); NULL, info->ops);
ret = info->init(card, NULL, links + link_id, info, 0); ret = info->init(card, NULL, links + link_index, info, 0);
if (ret < 0) if (ret < 0)
return ret; return ret;
INC_ID(be_id, cpu_id, link_id); INC_ID(be_id, cpu_id, link_index);
} }
DMIC: DMIC:
@@ -1273,21 +1279,21 @@ DMIC:
goto HDMI; goto HDMI;
} }
cpus[cpu_id].dai_name = "DMIC01 Pin"; cpus[cpu_id].dai_name = "DMIC01 Pin";
init_dai_link(dev, links + link_id, be_id, "dmic01", init_dai_link(dev, links + link_index, be_id, "dmic01",
0, 1, // DMIC only supports capture 0, 1, // DMIC only supports capture
cpus + cpu_id, 1, cpus + cpu_id, 1,
dmic_component, 1, dmic_component, 1,
sof_sdw_dmic_init, NULL); sof_sdw_dmic_init, NULL);
INC_ID(be_id, cpu_id, link_id); INC_ID(be_id, cpu_id, link_index);
cpus[cpu_id].dai_name = "DMIC16k Pin"; cpus[cpu_id].dai_name = "DMIC16k Pin";
init_dai_link(dev, links + link_id, be_id, "dmic16k", init_dai_link(dev, links + link_index, be_id, "dmic16k",
0, 1, // DMIC only supports capture 0, 1, // DMIC only supports capture
cpus + cpu_id, 1, cpus + cpu_id, 1,
dmic_component, 1, dmic_component, 1,
/* don't call sof_sdw_dmic_init() twice */ /* don't call sof_sdw_dmic_init() twice */
NULL, NULL); NULL, NULL);
INC_ID(be_id, cpu_id, link_id); INC_ID(be_id, cpu_id, link_index);
} }
HDMI: HDMI:
@@ -1325,12 +1331,12 @@ HDMI:
return -ENOMEM; return -ENOMEM;
cpus[cpu_id].dai_name = cpu_name; cpus[cpu_id].dai_name = cpu_name;
init_dai_link(dev, links + link_id, be_id, name, init_dai_link(dev, links + link_index, be_id, name,
1, 0, // HDMI only supports playback 1, 0, // HDMI only supports playback
cpus + cpu_id, 1, cpus + cpu_id, 1,
idisp_components + i, 1, idisp_components + i, 1,
sof_sdw_hdmi_init, NULL); sof_sdw_hdmi_init, NULL);
INC_ID(be_id, cpu_id, link_id); INC_ID(be_id, cpu_id, link_index);
} }
if (sof_sdw_quirk & SOF_SSP_BT_OFFLOAD_PRESENT) { if (sof_sdw_quirk & SOF_SSP_BT_OFFLOAD_PRESENT) {
@@ -1354,7 +1360,7 @@ HDMI:
return -ENOMEM; return -ENOMEM;
cpus[cpu_id].dai_name = cpu_name; cpus[cpu_id].dai_name = cpu_name;
init_dai_link(dev, links + link_id, be_id, name, 1, 1, init_dai_link(dev, links + link_index, be_id, name, 1, 1,
cpus + cpu_id, 1, ssp_components, 1, NULL, NULL); cpus + cpu_id, 1, ssp_components, 1, NULL, NULL);
} }

7
sound/soc/intel/boards/sof_sdw_common.h
View File

@@ -15,6 +15,7 @@
#define MAX_NO_PROPS 2 #define MAX_NO_PROPS 2
#define MAX_HDMI_NUM 4 #define MAX_HDMI_NUM 4
#define SDW_AMP_DAI_ID 2
#define SDW_DMIC_DAI_ID 4 #define SDW_DMIC_DAI_ID 4
#define SDW_MAX_CPU_DAIS 16 #define SDW_MAX_CPU_DAIS 16
#define SDW_INTEL_BIDIR_PDI_BASE 2 #define SDW_INTEL_BIDIR_PDI_BASE 2
@@ -42,7 +43,6 @@ enum {
#define SOF_SDW_PCH_DMIC BIT(6) #define SOF_SDW_PCH_DMIC BIT(6)
#define SOF_SSP_PORT(x) (((x) & GENMASK(5, 0)) << 7) #define SOF_SSP_PORT(x) (((x) & GENMASK(5, 0)) << 7)
#define SOF_SSP_GET_PORT(quirk) (((quirk) >> 7) & GENMASK(5, 0)) #define SOF_SSP_GET_PORT(quirk) (((quirk) >> 7) & GENMASK(5, 0))
#define SOF_RT715_DAI_ID_FIX BIT(13)
#define SOF_SDW_NO_AGGREGATION BIT(14) #define SOF_SDW_NO_AGGREGATION BIT(14)
/* BT audio offload: reserve 3 bits for future */ /* BT audio offload: reserve 3 bits for future */
@@ -52,9 +52,14 @@ enum {
(((quirk) << SOF_BT_OFFLOAD_SSP_SHIFT) & SOF_BT_OFFLOAD_SSP_MASK) (((quirk) << SOF_BT_OFFLOAD_SSP_SHIFT) & SOF_BT_OFFLOAD_SSP_MASK)
#define SOF_SSP_BT_OFFLOAD_PRESENT BIT(18) #define SOF_SSP_BT_OFFLOAD_PRESENT BIT(18)
#define SOF_SDW_CODEC_TYPE_JACK 0
#define SOF_SDW_CODEC_TYPE_AMP 1
#define SOF_SDW_CODEC_TYPE_MIC 2
struct sof_sdw_codec_info { struct sof_sdw_codec_info {
const int part_id; const int part_id;
const int version_id; const int version_id;
const int codec_type;
int amp_num; int amp_num;
const u8 acpi_id[ACPI_ID_LEN]; const u8 acpi_id[ACPI_ID_LEN];
const bool direction[2]; // playback & capture support const bool direction[2]; // playback & capture support

7
sound/soc/intel/boards/sof_sdw_rt715.c
View File

@@ -30,13 +30,6 @@ int sof_sdw_rt715_init(struct snd_soc_card *card,
struct sof_sdw_codec_info *info, struct sof_sdw_codec_info *info,
bool playback) bool playback)
{ {
/*
* DAI ID is fixed at SDW_DMIC_DAI_ID for 715 to
* keep sdw DMIC and HDMI setting static in UCM
*/
if (sof_sdw_quirk & SOF_RT715_DAI_ID_FIX)
dai_links->id = SDW_DMIC_DAI_ID;
dai_links->init = rt715_rtd_init; dai_links->init = rt715_rtd_init;
return 0; return 0;

7
sound/soc/intel/boards/sof_sdw_rt715_sdca.c
View File

@@ -30,13 +30,6 @@ int sof_sdw_rt715_sdca_init(struct snd_soc_card *card,
struct sof_sdw_codec_info *info, struct sof_sdw_codec_info *info,
bool playback) bool playback)
{ {
/*
* DAI ID is fixed at SDW_DMIC_DAI_ID for 715-SDCA to
* keep sdw DMIC and HDMI setting static in UCM
*/
if (sof_sdw_quirk & SOF_RT715_DAI_ID_FIX)
dai_links->id = SDW_DMIC_DAI_ID;
dai_links->init = rt715_sdca_rtd_init; dai_links->init = rt715_sdca_rtd_init;
return 0; return 0;