Skip to content

Commit 37bc407

Browse files
committed
Revert "ASoC: SOF: ipc3-topology: Convert the topology pin index to ALH dai index"
This reverts commit 3592316. Will use the upstream commit Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
1 parent e99b8f0 commit 37bc407

1 file changed

Lines changed: 2 additions & 24 deletions

File tree

sound/soc/sof/ipc3-topology.c

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@
2020
/* size of tplg ABI in bytes */
2121
#define SOF_IPC3_TPLG_ABI_SIZE 3
2222

23-
/* Base of SOF_DAI_INTEL_ALH, this should be aligned with SOC_SDW_INTEL_BIDIR_PDI_BASE */
24-
#define INTEL_ALH_DAI_INDEX_BASE 2
25-
2623
struct sof_widget_data {
2724
int ctrl_type;
2825
int ipc_cmd;
@@ -1597,17 +1594,6 @@ static int sof_ipc3_widget_setup_comp_dai(struct snd_sof_widget *swidget)
15971594
if (ret < 0)
15981595
goto free;
15991596

1600-
/* Subtract the base to match the FW dai index. */
1601-
if (comp_dai->type == SOF_DAI_INTEL_ALH) {
1602-
if (comp_dai->dai_index < INTEL_ALH_DAI_INDEX_BASE) {
1603-
dev_err(sdev->dev,
1604-
"Invalid ALH dai index %d, only Pin numbers >= %d can be used\n",
1605-
comp_dai->dai_index, INTEL_ALH_DAI_INDEX_BASE);
1606-
return -EINVAL;
1607-
}
1608-
comp_dai->dai_index -= INTEL_ALH_DAI_INDEX_BASE;
1609-
}
1610-
16111597
dev_dbg(scomp->dev, "dai %s: type %d index %d\n",
16121598
swidget->widget->name, comp_dai->type, comp_dai->dai_index);
16131599
sof_dbg_comp_config(scomp, &comp_dai->config);
@@ -2181,16 +2167,8 @@ static int sof_ipc3_dai_config(struct snd_sof_dev *sdev, struct snd_sof_widget *
21812167
case SOF_DAI_INTEL_ALH:
21822168
if (data) {
21832169
/* save the dai_index during hw_params and reuse it for hw_free */
2184-
if (flags & SOF_DAI_CONFIG_FLAGS_HW_PARAMS) {
2185-
/* Subtract the base to match the FW dai index. */
2186-
if (data->dai_index < INTEL_ALH_DAI_INDEX_BASE) {
2187-
dev_err(sdev->dev,
2188-
"Invalid ALH dai index %d, only Pin numbers >= %d can be used\n",
2189-
config->dai_index, INTEL_ALH_DAI_INDEX_BASE);
2190-
return -EINVAL;
2191-
}
2192-
config->dai_index = data->dai_index - INTEL_ALH_DAI_INDEX_BASE;
2193-
}
2170+
if (flags & SOF_DAI_CONFIG_FLAGS_HW_PARAMS)
2171+
config->dai_index = data->dai_index;
21942172
config->alh.stream_id = data->dai_data;
21952173
}
21962174
break;

0 commit comments

Comments
 (0)