ASoC: SOF: ipc4-topology: set dmic dai index from copier

[juimonen]

Dmic dai index was set incorrectly to bits 5-7, when it is actually using just all lowest 8 bits. As the dmic index can only be 0 or 1, just OR copier dai index directly to node_id and remove the macro for fiddling the dmic index.

Signed-off-by: Jaska Uimonen jaska.uimonen@linux.intel.com

[juimonen]

needs to be synced with thesofproject/sof#6877. for windows compatibility

[juimonen]

the reason for this: thesofproject/sof#6872

[ranj063]

SOFCI TEST

[juimonen]

@libinyang can you test this and the related fw revert with your wov pipeline? you are probably currently the only one with that setup and this will affect you, thanks!

[ujfalusi]

Do you have a fixes tag with SHA?

[juimonen]

ok let me add

[juimonen]

@ujfalusi added fixes tag

[abonislawski]

This is good but if you prefer you can stay with SOF_IPC4_NODE_INDEX_INTEL_DMIC, just bit calculations must be correct.

typedef union _DmicDmaNodeIdVindex
{
    //! Raw 8-bit value of virtual index
    uint8_t b;
    //! Bit fields
    struct /*Bits*/
    {
        //! Index of the input queue within the DMIC instance.
        uint8_t dmic_interface_queue_id : 3;
        //! Index of the time slot group within the queue.
        uint8_t time_slot_group_index   : 2;
        //! Index of DMIC instance.
        uint8_t instance                : 3;
    } f; //!< Bits
} DmicDmaNodeIdVindex;

we need to set dmic_interface_queue_id instead of instance in current code

time_slot_group_index and instance are always 0

[juimonen]

updated v2. Perhaps we do it as @abonislawski suggested. Never know if we need to use the other bits in the future, and the change is even simpler/smaller.