From 463fb9399d96fff1d1401270af1b65f07667e55c Mon Sep 17 00:00:00 2001 From: Andrula Song Date: Thu, 14 Sep 2023 19:38:23 +0800 Subject: [PATCH] Audio: use struct dai_ts_cfg replace timestamp_cfg Use struct dai_ts_cfg replace timestamp_cfg of struct dai_data in dai-zephyr.h Signed-off-by: Andrula Song --- src/audio/dai-zephyr.c | 2 +- src/include/sof/lib/dai-zephyr.h | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/audio/dai-zephyr.c b/src/audio/dai-zephyr.c index c892873420a1..abe6ae075df8 100644 --- a/src/audio/dai-zephyr.c +++ b/src/audio/dai-zephyr.c @@ -1669,7 +1669,7 @@ static int dai_copy(struct comp_dev *dev) int dai_common_ts_config_op(struct dai_data *dd, struct comp_dev *dev) { struct ipc_config_dai *dai = &dd->ipc_config; - struct dai_ts_cfg *cfg = (struct dai_ts_cfg *)&dd->ts_config; + struct dai_ts_cfg *cfg = &dd->ts_config; comp_dbg(dev, "dai_ts_config()"); if (!dd->chan) { diff --git a/src/include/sof/lib/dai-zephyr.h b/src/include/sof/lib/dai-zephyr.h index 65ae27ddf9ac..98e174a43c8d 100644 --- a/src/include/sof/lib/dai-zephyr.h +++ b/src/include/sof/lib/dai-zephyr.h @@ -53,15 +53,6 @@ struct dai { struct k_spinlock lock; /* protect properties */ }; -struct timestamp_cfg { - uint32_t walclk_rate; /* Rate in Hz, e.g. 19200000 */ - int type; /* SSP, DMIC, HDA, etc. */ - int direction; /* Playback, capture */ - int index; /* For SSPx to select correct timestamp register */ - int dma_id; /* GPDMA id*/ - int dma_chan_index; /* Used GPDMA channel */ - int dma_chan_count; /* Channels in single GPDMA */ -}; union hdalink_cfg { uint16_t full; struct { @@ -127,7 +118,7 @@ struct dai_data { struct comp_dev *dai_dev; struct comp_buffer *dma_buffer; struct comp_buffer *local_buffer; - struct timestamp_cfg ts_config; + struct dai_ts_cfg ts_config; struct dai *dai; struct dma *dma; struct dai_group *group; /* NULL if no group assigned */