Skip to content

Commit 7860df5

Browse files
vijendarmukundabroonie
authored andcommitted
ASoC: sdw_util/intel: move soundwire endpoint and dai link structures
Move Soundwire endpoint and dai link structures from Intel generic machine driver code to common place holder(soc_sdw_utils.h). These structures will be used in other platform SoundWire machine driver code. Signed-off-by: Vijendar Mukunda <[email protected]> Reviewed-by: Bard Liao <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 23f020b commit 7860df5

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

include/sound/soc_sdw_utils.h

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,27 @@ struct asoc_sdw_mc_private {
9393
int codec_info_list_count;
9494
};
9595

96+
struct asoc_sdw_endpoint {
97+
struct list_head list;
98+
99+
u32 link_mask;
100+
const char *codec_name;
101+
const char *name_prefix;
102+
bool include_sidecar;
103+
104+
struct asoc_sdw_codec_info *codec_info;
105+
const struct asoc_sdw_dai_info *dai_info;
106+
};
107+
108+
struct asoc_sdw_dailink {
109+
bool initialised;
110+
111+
u8 group_id;
112+
u32 link_mask[SNDRV_PCM_STREAM_LAST + 1];
113+
int num_devs[SNDRV_PCM_STREAM_LAST + 1];
114+
struct list_head endpoints;
115+
};
116+
96117
extern struct asoc_sdw_codec_info codec_info_list[];
97118
int asoc_sdw_get_codec_info_list_count(void);
98119

sound/soc/intel/boards/sof_sdw.c

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -617,27 +617,6 @@ static const struct snd_soc_ops sdw_ops = {
617617
.shutdown = asoc_sdw_shutdown,
618618
};
619619

620-
struct asoc_sdw_endpoint {
621-
struct list_head list;
622-
623-
u32 link_mask;
624-
const char *codec_name;
625-
const char *name_prefix;
626-
bool include_sidecar;
627-
628-
struct asoc_sdw_codec_info *codec_info;
629-
const struct asoc_sdw_dai_info *dai_info;
630-
};
631-
632-
struct asoc_sdw_dailink {
633-
bool initialised;
634-
635-
u8 group_id;
636-
u32 link_mask[SNDRV_PCM_STREAM_LAST + 1];
637-
int num_devs[SNDRV_PCM_STREAM_LAST + 1];
638-
struct list_head endpoints;
639-
};
640-
641620
static const char * const type_strings[] = {"SimpleJack", "SmartAmp", "SmartMic"};
642621

643622
static int asoc_sdw_count_sdw_endpoints(struct snd_soc_card *card, int *num_devs, int *num_ends)

0 commit comments

Comments
 (0)