Skip to content

Commit 87f05e9

Browse files
committed
Revert "ASoC: SOF: sof-audio: Add a new op in struct sof_ipc_tplg_ops"
This reverts commit 259fa00. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
1 parent 8e500f4 commit 87f05e9

File tree

2 files changed

+0
-23
lines changed

2 files changed

+0
-23
lines changed

sound/soc/sof/ipc4-topology.c

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1796,25 +1796,6 @@ sof_ipc4_prepare_dai_copier(struct snd_sof_dev *sdev, struct snd_sof_dai *dai,
17961796
return ret;
17971797
}
17981798

1799-
static void sof_ipc4_host_config(struct snd_sof_dev *sdev, struct snd_sof_widget *swidget,
1800-
struct snd_sof_platform_stream_params *platform_params)
1801-
{
1802-
struct sof_ipc4_copier *ipc4_copier = (struct sof_ipc4_copier *)swidget->private;
1803-
struct snd_sof_widget *pipe_widget = swidget->spipe->pipe_widget;
1804-
struct sof_ipc4_copier_data *copier_data = &ipc4_copier->data;
1805-
struct sof_ipc4_pipeline *pipeline = pipe_widget->private;
1806-
u32 host_dma_id = platform_params->stream_tag - 1;
1807-
1808-
if (pipeline->use_chain_dma) {
1809-
pipeline->msg.primary &= ~SOF_IPC4_GLB_CHAIN_DMA_HOST_ID_MASK;
1810-
pipeline->msg.primary |= SOF_IPC4_GLB_CHAIN_DMA_HOST_ID(host_dma_id);
1811-
return;
1812-
}
1813-
1814-
copier_data->gtw_cfg.node_id &= ~SOF_IPC4_NODE_INDEX_MASK;
1815-
copier_data->gtw_cfg.node_id |= SOF_IPC4_NODE_INDEX(host_dma_id);
1816-
}
1817-
18181799
static int
18191800
sof_ipc4_prepare_copier_module(struct snd_sof_widget *swidget,
18201801
struct snd_pcm_hw_params *fe_params,
@@ -3579,5 +3560,4 @@ const struct sof_ipc_tplg_ops ipc4_tplg_ops = {
35793560
.dai_get_param = sof_ipc4_dai_get_param,
35803561
.tear_down_all_pipelines = sof_ipc4_tear_down_all_pipelines,
35813562
.link_setup = sof_ipc4_link_setup,
3582-
.host_config = sof_ipc4_host_config,
35833563
};

sound/soc/sof/sof-audio.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,6 @@ struct sof_ipc_tplg_widget_ops {
209209
* @widget_setup: Function pointer for setting up setup in the DSP
210210
* @widget_free: Function pointer for freeing widget in the DSP
211211
* @dai_config: Function pointer for sending DAI config IPC to the DSP
212-
* @host_config: Function pointer for setting the DMA ID for host widgets
213212
* @dai_get_param: Function pointer for getting the DAI parameter
214213
* @set_up_all_pipelines: Function pointer for setting up all topology pipelines
215214
* @tear_down_all_pipelines: Function pointer for tearing down all topology pipelines
@@ -231,8 +230,6 @@ struct sof_ipc_tplg_ops {
231230
int (*widget_free)(struct snd_sof_dev *sdev, struct snd_sof_widget *swidget);
232231
int (*dai_config)(struct snd_sof_dev *sdev, struct snd_sof_widget *swidget,
233232
unsigned int flags, struct snd_sof_dai_config_data *data);
234-
void (*host_config)(struct snd_sof_dev *sdev, struct snd_sof_widget *swidget,
235-
struct snd_sof_platform_stream_params *platform_params);
236233
int (*dai_get_param)(struct snd_sof_dev *sdev, struct snd_sof_dai *dai, int param_type);
237234
int (*set_up_all_pipelines)(struct snd_sof_dev *sdev, bool verify);
238235
int (*tear_down_all_pipelines)(struct snd_sof_dev *sdev, bool verify);

0 commit comments

Comments
 (0)