soundwire: qcom: Add set_channel_map api support
authorMohammad Rafi Shaik <quic_mohs@quicinc.com>
Thu, 6 Feb 2025 11:22:24 +0000 (16:52 +0530)
committerMark Brown <broonie@kernel.org>
Thu, 6 Feb 2025 11:49:22 +0000 (11:49 +0000)
Added qcom_swrm_set_channel_map api to set the master channel mask for
TX and RX paths based on the provided slots.

Added a new field ch_mask to the qcom_swrm_port_config structure.
This field is used to store the master channel mask, which allows more
flexible to configure channel mask in runtime for specific active
soundwire ports.

Modified the qcom_swrm_port_enable function to configure master
channel mask. If the ch_mask is set to SWR_INVALID_PARAM or is zero,
the function will use the default channel mask.

Signed-off-by: Mohammad Rafi Shaik <quic_mohs@quicinc.com>
Acked-by: Vinod Koul <vkoul@kernel.org>
Link: https://patch.msgid.link/20250206112225.3270400-4-quic_mohs@quicinc.com
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/soundwire/qcom.c

index 0f45e3404756f647e89afefb7b0e5836daa19e3c..295a46dc2be75542eff08ee8b53553c4e79152fc 100644 (file)
@@ -156,6 +156,7 @@ struct qcom_swrm_port_config {
        u8 word_length;
        u8 blk_group_count;
        u8 lane_control;
+       u8 ch_mask;
 };
 
 /*
@@ -1048,9 +1049,13 @@ static int qcom_swrm_port_enable(struct sdw_bus *bus,
 {
        u32 reg = SWRM_DP_PORT_CTRL_BANK(enable_ch->port_num, bank);
        struct qcom_swrm_ctrl *ctrl = to_qcom_sdw(bus);
+       struct qcom_swrm_port_config *pcfg;
        u32 val;
 
+       pcfg = &ctrl->pconfig[enable_ch->port_num];
        ctrl->reg_read(ctrl, reg, &val);
+       if (pcfg->ch_mask != SWR_INVALID_PARAM && pcfg->ch_mask != 0)
+               enable_ch->ch_mask = pcfg->ch_mask;
 
        if (enable_ch->enable)
                val |= (enable_ch->ch_mask << SWRM_DP_PORT_CTRL_EN_CHAN_SHFT);
@@ -1270,6 +1275,26 @@ static void *qcom_swrm_get_sdw_stream(struct snd_soc_dai *dai, int direction)
        return ctrl->sruntime[dai->id];
 }
 
+static int qcom_swrm_set_channel_map(struct snd_soc_dai *dai,
+                                    unsigned int tx_num, const unsigned int *tx_slot,
+                                    unsigned int rx_num, const unsigned int *rx_slot)
+{
+       struct qcom_swrm_ctrl *ctrl = dev_get_drvdata(dai->dev);
+       int i;
+
+       if (tx_slot) {
+               for (i = 0; i < tx_num; i++)
+                       ctrl->pconfig[i].ch_mask = tx_slot[i];
+       }
+
+       if (rx_slot) {
+               for (i = 0; i < rx_num; i++)
+                       ctrl->pconfig[i].ch_mask = rx_slot[i];
+       }
+
+       return 0;
+}
+
 static int qcom_swrm_startup(struct snd_pcm_substream *substream,
                             struct snd_soc_dai *dai)
 {
@@ -1306,6 +1331,7 @@ static const struct snd_soc_dai_ops qcom_swrm_pdm_dai_ops = {
        .shutdown = qcom_swrm_shutdown,
        .set_stream = qcom_swrm_set_sdw_stream,
        .get_stream = qcom_swrm_get_sdw_stream,
+       .set_channel_map = qcom_swrm_set_channel_map,
 };
 
 static const struct snd_soc_component_driver qcom_swrm_dai_component = {