Ignore:
Timestamp:
Apr 21, 2025, 7:17:25 PM (4 months ago)
Author:
David Azarewicz
Message:

Merge from uniaud32-exp branch

Location:
GPL/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • GPL/trunk

  • GPL/trunk/alsa-kernel/include/sound/sof.h

    r772 r777  
    44 * redistributing this file, you may do so under either license.
    55 *
    6  * Copyright(c) 2018 Intel Corporation. All rights reserved.
     6 * Copyright(c) 2018 Intel Corporation
    77 *
    88 * Author: Liam Girdwood <liam.r.girdwood@linux.intel.com>
     
    5858};
    5959
    60 #define SOF_IPC         SOF_IPC_TYPE_3
    61 #define SOF_INTEL_IPC4  SOF_IPC_TYPE_4
     60struct sof_loadable_file_profile {
     61        enum sof_ipc_type ipc_type;
     62
     63        const char *fw_path;
     64        const char *fw_path_postfix;
     65        const char *fw_name;
     66        const char *fw_lib_path;
     67        const char *fw_lib_path_postfix;
     68        const char *tplg_path;
     69        const char *tplg_name;
     70};
    6271
    6372/*
     
    8998        /* descriptor */
    9099        const struct sof_dev_desc *desc;
     100
     101        /* platform's preferred IPC type and path overrides */
     102        struct sof_loadable_file_profile ipc_file_profile_base;
    91103
    92104        /* firmware and topology filenames */
     
    155167        const char *default_fw_filename[SOF_IPC_TYPE_COUNT];
    156168
    157         struct snd_sof_dsp_ops *ops;
     169        const struct snd_sof_dsp_ops *ops;
    158170        int (*ops_init)(struct snd_sof_dev *sdev);
    159171        void (*ops_free)(struct snd_sof_dev *sdev);
     
    162174int sof_dai_get_mclk(struct snd_soc_pcm_runtime *rtd);
    163175int sof_dai_get_bclk(struct snd_soc_pcm_runtime *rtd);
     176int sof_dai_get_tdm_slots(struct snd_soc_pcm_runtime *rtd);
    164177
    165178#endif
Note: See TracChangeset for help on using the changeset viewer.