[PATCH v3 0/5] Add static channel mapping between soundwire master and slave

[PATCH v3 0/5] Add static channel mapping between soundwire master and slave

[Mohammad Rafi Shaik]

Add static channel map support between soundwire master and slave.

Currently, the channel value for each soundwire port is hardcoded in the
wcd937x-sdw driver and the same channel  value is configured in the
soundwire master.

The Qualcomm board like the QCM6490-IDP require static channel map
settings for the soundwire master and slave ports.

If another boards which are using enable wcd937x, the channel mapping
index values between master and slave may be different depending on the
board hw design and requirements. If the above properties are not used
in a SoC specific device tree, the channel mapping index values are set
to default.

With the introduction of the following channel mapping properties, it is
now possible to configure the master channel mapping directly from the
device tree.

Added qcom_swrm_set_channel_map api to set the master channel values
which allows more flexible to configure channel values in runtime for
specific active soundwire ports.

Add get and set channel maps support from codec to cpu dais in common
Qualcomm sdw driver.

Changes since v2:
 - Rephrase commit description v2-0001 dt-bindings patch as suggested by Krzysztof.

Changes since v1:
 - Modified the design and followed new approach to setting the master channel mask.
 - Used existing set_channel_map api as suggested by Pierre-Louis
 - Fixed the typo mistake in v1-0001 dt-bindings patch.
 - Rephrase the commit description for all v1 patches.

Mohammad Rafi Shaik (5):
  ASoC: dt-bindings: Add bindings for wcd937x static channel mapping
  ASoC: dt-bindings: wcd937x-sdw: Add static channel mapping support
  ASoC: codecs: wcd937x: Add static channel mapping support in
    wcd937x-sdw
  soundwire: qcom: Add set_channel_map api support
  ASoC: qcom: sdw: Add get and set channel maps support from codec to
    cpu dais

 .../bindings/sound/qcom,wcd937x-sdw.yaml      | 48 +++++++++++++++++
 drivers/soundwire/qcom.c                      | 26 +++++++++
 include/dt-bindings/sound/qcom,wcd93xx.h      | 13 +++++
 sound/soc/codecs/wcd937x-sdw.c                | 38 +++++++++++--
 sound/soc/codecs/wcd937x.c                    | 53 ++++++++++++++++++-
 sound/soc/codecs/wcd937x.h                    |  6 ++-
 sound/soc/qcom/sdw.c                          | 34 ++++++++++--
 7 files changed, 208 insertions(+), 10 deletions(-)
 create mode 100644 include/dt-bindings/sound/qcom,wcd93xx.h

-- 
2.25.1

[PATCH v3 1/5] ASoC: dt-bindings: Add bindings for wcd937x static channel mapping

[Mohammad Rafi Shaik]

Add wcd937x static channel mapping values to avoid
having to use unclear number indices in device trees.

Signed-off-by: Mohammad Rafi Shaik <quic_mohs@quicinc.com>
---
 include/dt-bindings/sound/qcom,wcd93xx.h | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 include/dt-bindings/sound/qcom,wcd93xx.h

diff --git a/include/dt-bindings/sound/qcom,wcd93xx.h b/include/dt-bindings/sound/qcom,wcd93xx.h
new file mode 100644
index 000000000000..45bcc30d0393
--- /dev/null
+++ b/include/dt-bindings/sound/qcom,wcd93xx.h
@@ -0,0 +1,13 @@
+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+#ifndef __DT_SOUND_QCOM_WCD93xx_H
+#define __DT_SOUND_QCOM_WCD93xx_H
+
+#define SWRM_CH1 1
+#define SWRM_CH2 2
+#define SWRM_CH3 4
+#define SWRM_CH4 8
+
+#endif
-- 
2.25.1

Re: [PATCH v3 1/5] ASoC: dt-bindings: Add bindings for wcd937x static channel mapping

[Krzysztof Kozlowski]

On Tue, Nov 26, 2024 at 10:12:56PM +0530, Mohammad Rafi Shaik wrote:
> Add wcd937x static channel mapping values to avoid
> having to use unclear number indices in device trees.
> 
> Signed-off-by: Mohammad Rafi Shaik <quic_mohs@quicinc.com>
> ---
>  include/dt-bindings/sound/qcom,wcd93xx.h | 13 +++++++++++++
>  1 file changed, 13 insertions(+)
>  create mode 100644 include/dt-bindings/sound/qcom,wcd93xx.h
> 
> diff --git a/include/dt-bindings/sound/qcom,wcd93xx.h b/include/dt-bindings/sound/qcom,wcd93xx.h
> new file mode 100644
> index 000000000000..45bcc30d0393
> --- /dev/null
> +++ b/include/dt-bindings/sound/qcom,wcd93xx.h

Filename matching compatible, always.

> @@ -0,0 +1,13 @@
> +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
> + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
> + */
> +
> +#ifndef __DT_SOUND_QCOM_WCD93xx_H
> +#define __DT_SOUND_QCOM_WCD93xx_H
> +
> +#define SWRM_CH1 1
> +#define SWRM_CH2 2
> +#define SWRM_CH3 4
> +#define SWRM_CH4 8

Bindings define interface between driver and DTS. The values are
abstract, so alwys start from 0 or 1 and are incremented by 1, not by
power of 2. Also missing some sort of prefix, w.g. WCD9390_xxx

Anyway, this does not look like binding.

Best regards,
Krzysztof

Re: [PATCH v3 1/5] ASoC: dt-bindings: Add bindings for wcd937x static channel mapping

[Mohammad Rafi Shaik]

On 11/27/2024 1:35 PM, Krzysztof Kozlowski wrote:
> On Tue, Nov 26, 2024 at 10:12:56PM +0530, Mohammad Rafi Shaik wrote:
>> Add wcd937x static channel mapping values to avoid
>> having to use unclear number indices in device trees.
>>
>> Signed-off-by: Mohammad Rafi Shaik <quic_mohs@quicinc.com>
>> ---
>>   include/dt-bindings/sound/qcom,wcd93xx.h | 13 +++++++++++++
>>   1 file changed, 13 insertions(+)
>>   create mode 100644 include/dt-bindings/sound/qcom,wcd93xx.h
>>
>> diff --git a/include/dt-bindings/sound/qcom,wcd93xx.h b/include/dt-bindings/sound/qcom,wcd93xx.h
>> new file mode 100644
>> index 000000000000..45bcc30d0393
>> --- /dev/null
>> +++ b/include/dt-bindings/sound/qcom,wcd93xx.h
> 
> Filename matching compatible, always.
> 
>> @@ -0,0 +1,13 @@
>> +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
>> + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
>> + */
>> +
>> +#ifndef __DT_SOUND_QCOM_WCD93xx_H
>> +#define __DT_SOUND_QCOM_WCD93xx_H
>> +
>> +#define SWRM_CH1 1
>> +#define SWRM_CH2 2
>> +#define SWRM_CH3 4
>> +#define SWRM_CH4 8
> 
> Bindings define interface between driver and DTS. The values are
> abstract, so alwys start from 0 or 1 and are incremented by 1, not by
> power of 2. Also missing some sort of prefix, w.g. WCD9390_xxx
> 
> Anyway, this does not look like binding.
> 

Ack,

Will add the Prefix WCD9370_SWRM_CH1,


Added new binding support header file 
(include/dt-bindings/sound/qcom,wcd93xx.h) for providing channel mapping 
values to avoid having
to use unclear number indices in device trees.

> Best regards,
> Krzysztof
> 

Re: [PATCH v3 1/5] ASoC: dt-bindings: Add bindings for wcd937x static channel mapping

[Krzysztof Kozlowski]

On 03/12/2024 05:52, Mohammad Rafi Shaik wrote:
> On 11/27/2024 1:35 PM, Krzysztof Kozlowski wrote:
>> On Tue, Nov 26, 2024 at 10:12:56PM +0530, Mohammad Rafi Shaik wrote:
>>> Add wcd937x static channel mapping values to avoid
>>> having to use unclear number indices in device trees.
>>>
>>> Signed-off-by: Mohammad Rafi Shaik <quic_mohs@quicinc.com>
>>> ---
>>>   include/dt-bindings/sound/qcom,wcd93xx.h | 13 +++++++++++++
>>>   1 file changed, 13 insertions(+)
>>>   create mode 100644 include/dt-bindings/sound/qcom,wcd93xx.h
>>>
>>> diff --git a/include/dt-bindings/sound/qcom,wcd93xx.h b/include/dt-bindings/sound/qcom,wcd93xx.h
>>> new file mode 100644
>>> index 000000000000..45bcc30d0393
>>> --- /dev/null
>>> +++ b/include/dt-bindings/sound/qcom,wcd93xx.h
>>
>> Filename matching compatible, always.
>>
>>> @@ -0,0 +1,13 @@
>>> +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
>>> + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
>>> + */
>>> +
>>> +#ifndef __DT_SOUND_QCOM_WCD93xx_H
>>> +#define __DT_SOUND_QCOM_WCD93xx_H
>>> +
>>> +#define SWRM_CH1 1
>>> +#define SWRM_CH2 2
>>> +#define SWRM_CH3 4
>>> +#define SWRM_CH4 8
>>
>> Bindings define interface between driver and DTS. The values are
>> abstract, so alwys start from 0 or 1 and are incremented by 1, not by
>> power of 2. Also missing some sort of prefix, w.g. WCD9390_xxx
>>
>> Anyway, this does not look like binding.
>>
> 
> Ack,
> 
> Will add the Prefix WCD9370_SWRM_CH1,


No, this is not a binding, so drop. You skipped my entire reply
explaining why this is not a binding.


Best regards,
Krzysztof

[PATCH v3 2/5] ASoC: dt-bindings: wcd937x-sdw: Add static channel mapping support

[Mohammad Rafi Shaik]

Add static channel mapping between master and slave rx/tx ports for
Qualcomm wcd937x soundwire codec.

Currently, the channel map index value for each soundwire port is
hardcoded in the wcd937x-sdw driver, and the same channel map index
value is configured in the soundwire master.

The Qualcomm board like the QCM6490-IDP require static channel map
settings for the soundwire master and slave ports.

If another boards which are using enable wcd937x, the channel mapping
index values between master and slave may be different depending on the
board hw design and requirements. If the above properties are not used
in a SoC specific device tree, the channel mapping index values are set
to default.

With the introduction of the following channel mapping properties, it is
now possible to configure the master channel mapping directly from the
device tree.

The qcom,tx-channel-mapping property specifies the static channel mapping
between the slave and master tx ports in the order of slave port channels
which is adc1, adc2, adc3, adc4, dmic0, dmic1, mbhc, dmic2, dmic3, dmci4,
dmic5, dmic6, dmic7.

The qcom,rx-channel-mapping property specifies the static channel mapping
between the slave and master rx ports in the order of slave port channels
which is hph_l, hph_r, clsh, comp_l, comp_r, lo, dsd_r, dsd_l.

Signed-off-by: Mohammad Rafi Shaik <quic_mohs@quicinc.com>
---
 .../bindings/sound/qcom,wcd937x-sdw.yaml      | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/Documentation/devicetree/bindings/sound/qcom,wcd937x-sdw.yaml b/Documentation/devicetree/bindings/sound/qcom,wcd937x-sdw.yaml
index d3cf8f59cb23..7893b1c1f80b 100644
--- a/Documentation/devicetree/bindings/sound/qcom,wcd937x-sdw.yaml
+++ b/Documentation/devicetree/bindings/sound/qcom,wcd937x-sdw.yaml
@@ -58,6 +58,44 @@ properties:
     items:
       enum: [1, 2, 3, 4, 5]
 
+  qcom,tx-channel-mapping:
+    description: |
+      Specifies static channel mapping between slave and master tx port
+      channels.
+      In the order of slave port channels which is adc1, adc2, adc3,
+      dmic0, dmic1, mbhc, dmic2, dmic3, dmci4, dmic5, dmic6, dmic7.
+      The channel map index values are fixed values.
+      SWRM_CH1 ==> 1
+      SWRM_CH2 ==> 2
+      SWRM_CH3 ==> 4
+      SWRM_CH4 ==> 8
+
+    $ref: /schemas/types.yaml#/definitions/uint8-array
+    minItems: 12
+    maxItems: 12
+    additionalItems: false
+    items:
+      enum: [1, 2, 4, 8]
+
+  qcom,rx-channel-mapping:
+    description: |
+      Specifies static channels mapping between slave and master rx port
+      channels.
+      In the order of slave port channels, which is
+      hph_l, hph_r, clsh, comp_l, comp_r, lo, dsd_r, dsd_l.
+      The channel map index values are fixed values.
+      SWRM_CH1 ==> 1
+      SWRM_CH2 ==> 2
+      SWRM_CH3 ==> 4
+      SWRM_CH4 ==> 8
+
+    $ref: /schemas/types.yaml#/definitions/uint8-array
+    minItems: 8
+    maxItems: 8
+    additionalItems: false
+    items:
+      enum: [1, 2, 4, 8]
+
 required:
   - compatible
   - reg
@@ -66,6 +104,9 @@ additionalProperties: false
 
 examples:
   - |
+
+    #include <dt-bindings/sound/qcom,wcd93xx.h>
+
     soundwire@3210000 {
         reg = <0x03210000 0x2000>;
         #address-cells = <2>;
@@ -74,6 +115,9 @@ examples:
             compatible = "sdw20217010a00";
             reg = <0 4>;
             qcom,rx-port-mapping = <1 2 3 4 5>;
+            qcom,rx-channel-mapping =  /bits/ 8 <SWRM_CH1 SWRM_CH2 SWRM_CH1
+                                                 SWRM_CH1 SWRM_CH2 SWRM_CH1
+                                                 SWRM_CH1 SWRM_CH2>;
         };
     };
 
@@ -85,6 +129,10 @@ examples:
             compatible = "sdw20217010a00";
             reg = <0 3>;
             qcom,tx-port-mapping = <2 2 3 4>;
+            qcom,tx-channel-mapping = /bits/ 8 <SWRM_CH1 SWRM_CH2 SWRM_CH2
+                                                SWRM_CH1 SWRM_CH2 SWRM_CH3
+                                                SWRM_CH3 SWRM_CH4 SWRM_CH1
+                                                SWRM_CH2 SWRM_CH3 SWRM_CH4>;
         };
     };
 
-- 
2.25.1

Re: [PATCH v3 2/5] ASoC: dt-bindings: wcd937x-sdw: Add static channel mapping support

[Krzysztof Kozlowski]

On Tue, Nov 26, 2024 at 10:12:57PM +0530, Mohammad Rafi Shaik wrote:
> diff --git a/Documentation/devicetree/bindings/sound/qcom,wcd937x-sdw.yaml b/Documentation/devicetree/bindings/sound/qcom,wcd937x-sdw.yaml
> index d3cf8f59cb23..7893b1c1f80b 100644
> --- a/Documentation/devicetree/bindings/sound/qcom,wcd937x-sdw.yaml
> +++ b/Documentation/devicetree/bindings/sound/qcom,wcd937x-sdw.yaml
> @@ -58,6 +58,44 @@ properties:
>      items:
>        enum: [1, 2, 3, 4, 5]
>  
> +  qcom,tx-channel-mapping:
> +    description: |
> +      Specifies static channel mapping between slave and master tx port
> +      channels.
> +      In the order of slave port channels which is adc1, adc2, adc3,
> +      dmic0, dmic1, mbhc, dmic2, dmic3, dmci4, dmic5, dmic6, dmic7.
> +      The channel map index values are fixed values.
> +      SWRM_CH1 ==> 1
> +      SWRM_CH2 ==> 2
> +      SWRM_CH3 ==> 4
> +      SWRM_CH4 ==> 8

I am surprised to see here again 1/2/4/8. My comments were not
addressed. I think we agreed during our off-list talk that you will use
1, 2, 3 and 4.

> +
> +    $ref: /schemas/types.yaml#/definitions/uint8-array
> +    minItems: 12
> +    maxItems: 12
> +    additionalItems: false
> +    items:
> +      enum: [1, 2, 4, 8]

Best regards,
Krzysztof

Re: [PATCH v3 2/5] ASoC: dt-bindings: wcd937x-sdw: Add static channel mapping support

[Mohammad Rafi Shaik]

On 11/27/2024 1:38 PM, Krzysztof Kozlowski wrote:
> On Tue, Nov 26, 2024 at 10:12:57PM +0530, Mohammad Rafi Shaik wrote:
>> diff --git a/Documentation/devicetree/bindings/sound/qcom,wcd937x-sdw.yaml b/Documentation/devicetree/bindings/sound/qcom,wcd937x-sdw.yaml
>> index d3cf8f59cb23..7893b1c1f80b 100644
>> --- a/Documentation/devicetree/bindings/sound/qcom,wcd937x-sdw.yaml
>> +++ b/Documentation/devicetree/bindings/sound/qcom,wcd937x-sdw.yaml
>> @@ -58,6 +58,44 @@ properties:
>>       items:
>>         enum: [1, 2, 3, 4, 5]
>>   
>> +  qcom,tx-channel-mapping:
>> +    description: |
>> +      Specifies static channel mapping between slave and master tx port
>> +      channels.
>> +      In the order of slave port channels which is adc1, adc2, adc3,
>> +      dmic0, dmic1, mbhc, dmic2, dmic3, dmci4, dmic5, dmic6, dmic7.
>> +      The channel map index values are fixed values.
>> +      SWRM_CH1 ==> 1
>> +      SWRM_CH2 ==> 2
>> +      SWRM_CH3 ==> 4
>> +      SWRM_CH4 ==> 8
> 
> I am surprised to see here again 1/2/4/8. My comments were not
> addressed. I think we agreed during our off-list talk that you will use
> 1, 2, 3 and 4.
> 
Ack,

Yes right,

Will add the change in next patch set.

will add the channel map values starting from 0 based on order of slave 
port channels which are starting from 0.

SWRM_CH1 ==> 0
SWRM_CH2 ==> 1
SWRM_CH3 ==> 2
SWRM_CH4 ==> 3

Thanks & Regards,
Rafi.

>> +
>> +    $ref: /schemas/types.yaml#/definitions/uint8-array
>> +    minItems: 12
>> +    maxItems: 12
>> +    additionalItems: false
>> +    items:
>> +      enum: [1, 2, 4, 8]
> 
> Best regards,
> Krzysztof
> 

Re: [PATCH v3 2/5] ASoC: dt-bindings: wcd937x-sdw: Add static channel mapping support

[Krzysztof Kozlowski]

On 05/12/2024 04:56, Mohammad Rafi Shaik wrote:
> On 11/27/2024 1:38 PM, Krzysztof Kozlowski wrote:
>> On Tue, Nov 26, 2024 at 10:12:57PM +0530, Mohammad Rafi Shaik wrote:
>>> diff --git a/Documentation/devicetree/bindings/sound/qcom,wcd937x-sdw.yaml b/Documentation/devicetree/bindings/sound/qcom,wcd937x-sdw.yaml
>>> index d3cf8f59cb23..7893b1c1f80b 100644
>>> --- a/Documentation/devicetree/bindings/sound/qcom,wcd937x-sdw.yaml
>>> +++ b/Documentation/devicetree/bindings/sound/qcom,wcd937x-sdw.yaml
>>> @@ -58,6 +58,44 @@ properties:
>>>       items:
>>>         enum: [1, 2, 3, 4, 5]
>>>   
>>> +  qcom,tx-channel-mapping:
>>> +    description: |
>>> +      Specifies static channel mapping between slave and master tx port
>>> +      channels.
>>> +      In the order of slave port channels which is adc1, adc2, adc3,
>>> +      dmic0, dmic1, mbhc, dmic2, dmic3, dmci4, dmic5, dmic6, dmic7.
>>> +      The channel map index values are fixed values.
>>> +      SWRM_CH1 ==> 1
>>> +      SWRM_CH2 ==> 2
>>> +      SWRM_CH3 ==> 4
>>> +      SWRM_CH4 ==> 8
>>
>> I am surprised to see here again 1/2/4/8. My comments were not
>> addressed. I think we agreed during our off-list talk that you will use
>> 1, 2, 3 and 4.
>>
> Ack,
> 
> Yes right,
> 
> Will add the change in next patch set.
> 
> will add the channel map values starting from 0 based on order of slave 
> port channels which are starting from 0.
> 
> SWRM_CH1 ==> 0
> SWRM_CH2 ==> 1
> SWRM_CH3 ==> 2
> SWRM_CH4 ==> 3
These are supposed to be channels, so 1=1, 2=2 not 1=0.

Best regards,
Krzysztof

Re: [PATCH v3 2/5] ASoC: dt-bindings: wcd937x-sdw: Add static channel mapping support

[Mohammad Rafi Shaik]

On 12/5/2024 12:52 PM, Krzysztof Kozlowski wrote:
> On 05/12/2024 04:56, Mohammad Rafi Shaik wrote:
>> On 11/27/2024 1:38 PM, Krzysztof Kozlowski wrote:
>>> On Tue, Nov 26, 2024 at 10:12:57PM +0530, Mohammad Rafi Shaik wrote:
>>>> diff --git a/Documentation/devicetree/bindings/sound/qcom,wcd937x-sdw.yaml b/Documentation/devicetree/bindings/sound/qcom,wcd937x-sdw.yaml
>>>> index d3cf8f59cb23..7893b1c1f80b 100644
>>>> --- a/Documentation/devicetree/bindings/sound/qcom,wcd937x-sdw.yaml
>>>> +++ b/Documentation/devicetree/bindings/sound/qcom,wcd937x-sdw.yaml
>>>> @@ -58,6 +58,44 @@ properties:
>>>>        items:
>>>>          enum: [1, 2, 3, 4, 5]
>>>>    
>>>> +  qcom,tx-channel-mapping:
>>>> +    description: |
>>>> +      Specifies static channel mapping between slave and master tx port
>>>> +      channels.
>>>> +      In the order of slave port channels which is adc1, adc2, adc3,
>>>> +      dmic0, dmic1, mbhc, dmic2, dmic3, dmci4, dmic5, dmic6, dmic7.
>>>> +      The channel map index values are fixed values.
>>>> +      SWRM_CH1 ==> 1
>>>> +      SWRM_CH2 ==> 2
>>>> +      SWRM_CH3 ==> 4
>>>> +      SWRM_CH4 ==> 8
>>>
>>> I am surprised to see here again 1/2/4/8. My comments were not
>>> addressed. I think we agreed during our off-list talk that you will use
>>> 1, 2, 3 and 4.
>>>
>> Ack,
>>
>> Yes right,
>>
>> Will add the change in next patch set.
>>
>> will add the channel map values starting from 0 based on order of slave
>> port channels which are starting from 0.
>>
>> SWRM_CH1 ==> 0
>> SWRM_CH2 ==> 1
>> SWRM_CH3 ==> 2
>> SWRM_CH4 ==> 3
> These are supposed to be channels, so 1=1, 2=2 not 1=0.
> 

Thanks for comment.

Ack,

i somehow missed this V3 patch mail comment and posted V4 patch set.

will address the comment and update change in v5 patch set

Thanks & Regards,
Rafi.

> Best regards,
> Krzysztof

[PATCH v3 3/5] ASoC: codecs: wcd937x: Add static channel mapping support in wcd937x-sdw

[Mohammad Rafi Shaik]

Add static channel mapping between master and slave ports in
wcd937x-sdw driver.

Currently, the channel mask for each soundwire port is hardcoded in the
wcd937x-sdw driver, and the same channel mask value is configured in the
soundwire master.

The Qualcomm boards like the QCM6490-IDP require different channel mask
settings for the soundwire master and slave ports.

Implemented logic to read TX/RX channel mappings from device tree
properties (qcom,tx-channel-mapping and qcom,rx-channel-mapping).

Modified the wcd937x_connect_port to handle master channel masks during
port enable/disable operations.

Added wcd937x_get_channel_map api to retrieve the current master
channel map for TX and RX paths.

Signed-off-by: Mohammad Rafi Shaik <quic_mohs@quicinc.com>
---
 sound/soc/codecs/wcd937x-sdw.c | 38 +++++++++++++++++++++---
 sound/soc/codecs/wcd937x.c     | 53 ++++++++++++++++++++++++++++++++--
 sound/soc/codecs/wcd937x.h     |  6 +++-
 3 files changed, 90 insertions(+), 7 deletions(-)

diff --git a/sound/soc/codecs/wcd937x-sdw.c b/sound/soc/codecs/wcd937x-sdw.c
index 0c33f7f3dc25..3263bdf25d86 100644
--- a/sound/soc/codecs/wcd937x-sdw.c
+++ b/sound/soc/codecs/wcd937x-sdw.c
@@ -19,7 +19,7 @@
 #include <sound/soc.h>
 #include "wcd937x.h"
 
-static const struct wcd937x_sdw_ch_info wcd937x_sdw_rx_ch_info[] = {
+static struct wcd937x_sdw_ch_info wcd937x_sdw_rx_ch_info[] = {
 	WCD_SDW_CH(WCD937X_HPH_L, WCD937X_HPH_PORT, BIT(0)),
 	WCD_SDW_CH(WCD937X_HPH_R, WCD937X_HPH_PORT, BIT(1)),
 	WCD_SDW_CH(WCD937X_CLSH, WCD937X_CLSH_PORT, BIT(0)),
@@ -30,7 +30,7 @@ static const struct wcd937x_sdw_ch_info wcd937x_sdw_rx_ch_info[] = {
 	WCD_SDW_CH(WCD937X_DSD_R, WCD937X_DSD_PORT, BIT(1)),
 };
 
-static const struct wcd937x_sdw_ch_info wcd937x_sdw_tx_ch_info[] = {
+static struct wcd937x_sdw_ch_info wcd937x_sdw_tx_ch_info[] = {
 	WCD_SDW_CH(WCD937X_ADC1, WCD937X_ADC_1_PORT, BIT(0)),
 	WCD_SDW_CH(WCD937X_ADC2, WCD937X_ADC_2_3_PORT, BIT(0)),
 	WCD_SDW_CH(WCD937X_ADC3, WCD937X_ADC_2_3_PORT, BIT(0)),
@@ -1019,7 +1019,9 @@ static int wcd9370_probe(struct sdw_slave *pdev,
 {
 	struct device *dev = &pdev->dev;
 	struct wcd937x_sdw_priv *wcd;
-	int ret;
+	u8 master_ch_mask[WCD937X_MAX_SWR_CH_IDS];
+	int master_ch_mask_size = 0;
+	int ret, i;
 
 	wcd = devm_kzalloc(dev, sizeof(*wcd), GFP_KERNEL);
 	if (!wcd)
@@ -1048,10 +1050,36 @@ static int wcd9370_probe(struct sdw_slave *pdev,
 				   SDW_SCP_INT1_PARITY;
 	pdev->prop.lane_control_support = true;
 	pdev->prop.simple_clk_stop_capable = true;
+
+	memset(master_ch_mask, 0, WCD937X_MAX_SWR_CH_IDS);
+
+	if (wcd->is_tx) {
+		master_ch_mask_size = of_property_count_u8_elems(dev->of_node,
+								 "qcom,tx-channel-mapping");
+
+		if (master_ch_mask_size)
+			ret = of_property_read_u8_array(dev->of_node, "qcom,tx-channel-mapping",
+							master_ch_mask, master_ch_mask_size);
+	} else {
+		master_ch_mask_size = of_property_count_u8_elems(dev->of_node,
+								 "qcom,rx-channel-mapping");
+
+		if (master_ch_mask_size)
+			ret = of_property_read_u8_array(dev->of_node, "qcom,rx-channel-mapping",
+							master_ch_mask, master_ch_mask_size);
+	}
+
+	if (ret < 0)
+		dev_info(dev, "Static channel mapping not specified using device channel maps\n");
+
 	if (wcd->is_tx) {
-		pdev->prop.source_ports = GENMASK(WCD937X_MAX_TX_SWR_PORTS - 1, 0);
+		pdev->prop.source_ports = GENMASK(WCD937X_MAX_TX_SWR_PORTS, 0);
 		pdev->prop.src_dpn_prop = wcd937x_dpn_prop;
 		wcd->ch_info = &wcd937x_sdw_tx_ch_info[0];
+
+		for (i = 0; i < master_ch_mask_size; i++)
+			wcd->ch_info[i].master_ch_mask = master_ch_mask[i];
+
 		pdev->prop.wake_capable = true;
 
 		wcd->regmap = devm_regmap_init_sdw(pdev, &wcd937x_regmap_config);
@@ -1065,6 +1093,8 @@ static int wcd9370_probe(struct sdw_slave *pdev,
 		pdev->prop.sink_ports = GENMASK(WCD937X_MAX_SWR_PORTS - 1, 0);
 		pdev->prop.sink_dpn_prop = wcd937x_dpn_prop;
 		wcd->ch_info = &wcd937x_sdw_rx_ch_info[0];
+		for (i = 0; i < master_ch_mask_size; i++)
+			wcd->ch_info[i].master_ch_mask = master_ch_mask[i];
 	}
 
 
diff --git a/sound/soc/codecs/wcd937x.c b/sound/soc/codecs/wcd937x.c
index c9d5e67bf66e..e8d3fddbc7b1 100644
--- a/sound/soc/codecs/wcd937x.c
+++ b/sound/soc/codecs/wcd937x.c
@@ -1197,13 +1197,21 @@ static int wcd937x_connect_port(struct wcd937x_sdw_priv *wcd, u8 port_idx, u8 ch
 	const struct wcd937x_sdw_ch_info *ch_info = &wcd->ch_info[ch_id];
 	u8 port_num = ch_info->port_num;
 	u8 ch_mask = ch_info->ch_mask;
+	u8 mstr_port_num, mstr_ch_mask;
+	struct sdw_slave *sdev = wcd->sdev;
 
 	port_config->num = port_num;
 
-	if (enable)
+	mstr_port_num = sdev->m_port_map[port_num];
+	mstr_ch_mask = ch_info->master_ch_mask;
+
+	if (enable) {
 		port_config->ch_mask |= ch_mask;
-	else
+		wcd->master_channel_map[mstr_port_num] |= mstr_ch_mask;
+	} else {
 		port_config->ch_mask &= ~ch_mask;
+		wcd->master_channel_map[mstr_port_num] &= ~mstr_ch_mask;
+	}
 
 	return 0;
 }
@@ -2689,10 +2697,51 @@ static int wcd937x_codec_set_sdw_stream(struct snd_soc_dai *dai,
 	return 0;
 }
 
+static int wcd937x_get_channel_map(const struct snd_soc_dai *dai,
+				   unsigned int *tx_num, unsigned int *tx_slot,
+				   unsigned int *rx_num, unsigned int *rx_slot)
+{
+	struct wcd937x_priv *wcd937x = dev_get_drvdata(dai->dev);
+	struct wcd937x_sdw_priv *wcd = wcd937x->sdw_priv[dai->id];
+	int i;
+
+	switch (dai->id) {
+	case AIF1_PB:
+		if (!rx_slot || !rx_num) {
+			dev_err(dai->dev, "Invalid rx_slot %p or rx_num %p\n",
+				rx_slot, rx_num);
+			return -EINVAL;
+		}
+
+		for (i = 0; i < SDW_MAX_PORTS; i++)
+			rx_slot[i] = wcd->master_channel_map[i];
+
+		*rx_num = i;
+		break;
+	case AIF1_CAP:
+		if (!tx_slot || !tx_num) {
+			dev_err(dai->dev, "Invalid tx_slot %p or tx_num %p\n",
+				tx_slot, tx_num);
+			return -EINVAL;
+		}
+
+		for (i = 0; i < SDW_MAX_PORTS; i++)
+			tx_slot[i] = wcd->master_channel_map[i];
+
+		*tx_num = i;
+		break;
+	default:
+		break;
+	}
+
+	return 0;
+}
+
 static const struct snd_soc_dai_ops wcd937x_sdw_dai_ops = {
 	.hw_params = wcd937x_codec_hw_params,
 	.hw_free = wcd937x_codec_free,
 	.set_stream = wcd937x_codec_set_sdw_stream,
+	.get_channel_map = wcd937x_get_channel_map,
 };
 
 static struct snd_soc_dai_driver wcd937x_dais[] = {
diff --git a/sound/soc/codecs/wcd937x.h b/sound/soc/codecs/wcd937x.h
index 4afa48dcaf74..a17851f23d18 100644
--- a/sound/soc/codecs/wcd937x.h
+++ b/sound/soc/codecs/wcd937x.h
@@ -510,12 +510,14 @@ enum wcd937x_rx_sdw_ports {
 struct wcd937x_sdw_ch_info {
 	int port_num;
 	unsigned int ch_mask;
+	unsigned int master_ch_mask;
 };
 
 #define WCD_SDW_CH(id, pn, cmask)	\
 	[id] = {			\
 		.port_num = pn,		\
 		.ch_mask = cmask,	\
+		.master_ch_mask = cmask,	\
 	}
 
 struct wcd937x_priv;
@@ -524,9 +526,11 @@ struct wcd937x_sdw_priv {
 	struct sdw_stream_config sconfig;
 	struct sdw_stream_runtime *sruntime;
 	struct sdw_port_config port_config[WCD937X_MAX_SWR_PORTS];
-	const struct wcd937x_sdw_ch_info *ch_info;
+	struct wcd937x_sdw_ch_info *ch_info;
 	bool port_enable[WCD937X_MAX_SWR_CH_IDS];
+	unsigned int master_channel_map[SDW_MAX_PORTS];
 	int active_ports;
+	int num_ports;
 	bool is_tx;
 	struct wcd937x_priv *wcd937x;
 	struct irq_domain *slave_irq;
-- 
2.25.1

Re: [PATCH v3 3/5] ASoC: codecs: wcd937x: Add static channel mapping support in wcd937x-sdw

[Krzysztof Kozlowski]

On Tue, Nov 26, 2024 at 10:12:58PM +0530, Mohammad Rafi Shaik wrote:
> Add static channel mapping between master and slave ports in
> wcd937x-sdw driver.
> 
> Currently, the channel mask for each soundwire port is hardcoded in the
> wcd937x-sdw driver, and the same channel mask value is configured in the
> soundwire master.
> 
> The Qualcomm boards like the QCM6490-IDP require different channel mask
> settings for the soundwire master and slave ports.
> 
> Implemented logic to read TX/RX channel mappings from device tree
> properties (qcom,tx-channel-mapping and qcom,rx-channel-mapping).
> 
> Modified the wcd937x_connect_port to handle master channel masks during
> port enable/disable operations.
> 
> Added wcd937x_get_channel_map api to retrieve the current master
> channel map for TX and RX paths.
> 
> Signed-off-by: Mohammad Rafi Shaik <quic_mohs@quicinc.com>
> ---
>  sound/soc/codecs/wcd937x-sdw.c | 38 +++++++++++++++++++++---
>  sound/soc/codecs/wcd937x.c     | 53 ++++++++++++++++++++++++++++++++--
>  sound/soc/codecs/wcd937x.h     |  6 +++-
>  3 files changed, 90 insertions(+), 7 deletions(-)
> 
> diff --git a/sound/soc/codecs/wcd937x-sdw.c b/sound/soc/codecs/wcd937x-sdw.c
> index 0c33f7f3dc25..3263bdf25d86 100644
> --- a/sound/soc/codecs/wcd937x-sdw.c
> +++ b/sound/soc/codecs/wcd937x-sdw.c
> @@ -19,7 +19,7 @@
>  #include <sound/soc.h>
>  #include "wcd937x.h"
>  

I don't see the bindings header being used here, so this is a proof for
you that these are not bindings constants.

Best regards,
Krzysztof

[PATCH v3 4/5] soundwire: qcom: Add set_channel_map api support

[Mohammad Rafi Shaik]

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>
---
 drivers/soundwire/qcom.c | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c
index 2b403b14066c..007183c6c047 100644
--- a/drivers/soundwire/qcom.c
+++ b/drivers/soundwire/qcom.c
@@ -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,27 @@ 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, unsigned int *tx_slot,
+				     unsigned int rx_num, unsigned int *rx_slot)
+{
+	struct qcom_swrm_ctrl *ctrl = dev_get_drvdata(dai->dev);
+	struct sdw_stream_runtime *sruntime = ctrl->sruntime[dai->id];
+	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 +1332,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 = {
-- 
2.25.1

[PATCH v3 5/5] ASoC: qcom: sdw: Add get and set channel maps support from codec to cpu dais

[Mohammad Rafi Shaik]

Add get and set channel maps support from codec to cpu dais.

Implemented logic to get the channel map in case of only sdw stream and
set channel map only for specific cpu dais.

Signed-off-by: Mohammad Rafi Shaik <quic_mohs@quicinc.com>
---
 drivers/soundwire/qcom.c |  5 ++---
 sound/soc/qcom/sdw.c     | 34 +++++++++++++++++++++++++++++++---
 2 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c
index 007183c6c047..6c3cff1194aa 100644
--- a/drivers/soundwire/qcom.c
+++ b/drivers/soundwire/qcom.c
@@ -1276,11 +1276,10 @@ static void *qcom_swrm_get_sdw_stream(struct snd_soc_dai *dai, int direction)
 }
 
 static int qcom_swrm_set_channel_map(struct snd_soc_dai *dai,
-				     unsigned int tx_num, unsigned int *tx_slot,
-				     unsigned int rx_num, unsigned int *rx_slot)
+				     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);
-	struct sdw_stream_runtime *sruntime = ctrl->sruntime[dai->id];
 	int i;
 
 	if (tx_slot) {
diff --git a/sound/soc/qcom/sdw.c b/sound/soc/qcom/sdw.c
index f2eda2ff46c0..d4d8ed46e6ff 100644
--- a/sound/soc/qcom/sdw.c
+++ b/sound/soc/qcom/sdw.c
@@ -25,7 +25,9 @@ int qcom_snd_sdw_startup(struct snd_pcm_substream *substream)
 	struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0);
 	struct sdw_stream_runtime *sruntime;
 	struct snd_soc_dai *codec_dai;
-	int ret, i;
+	int ret, i, j;
+	u32 rx_ch[SDW_MAX_PORTS], tx_ch[SDW_MAX_PORTS];
+	u32 rx_ch_cnt = 0, tx_ch_cnt = 0;
 
 	sruntime = sdw_alloc_stream(cpu_dai->name);
 	if (!sruntime)
@@ -35,9 +37,35 @@ int qcom_snd_sdw_startup(struct snd_pcm_substream *substream)
 		ret = snd_soc_dai_set_stream(codec_dai, sruntime,
 					     substream->stream);
 		if (ret < 0 && ret != -ENOTSUPP) {
-			dev_err(rtd->dev, "Failed to set sdw stream on %s\n",
-				codec_dai->name);
+			dev_err(rtd->dev, "Failed to set sdw stream on %s\n", codec_dai->name);
 			goto err_set_stream;
+		} else if (ret == -ENOTSUPP) {
+			/* Ignore unsupported */
+			continue;
+		}
+
+		ret = snd_soc_dai_get_channel_map(codec_dai, &tx_ch_cnt, tx_ch,
+						  &rx_ch_cnt, rx_ch);
+		if (ret != 0 && ret != -ENOTSUPP) {
+			dev_err(rtd->dev, "Failed to get codec chan map %s\n", codec_dai->name);
+			goto err_set_stream;
+		} else if (ret == -ENOTSUPP) {
+			/* Ignore unsupported */
+			continue;
+		}
+	}
+
+	switch (cpu_dai->id) {
+	case RX_CODEC_DMA_RX_0:
+	case TX_CODEC_DMA_TX_3:
+		if (tx_ch_cnt || rx_ch_cnt) {
+			for_each_rtd_codec_dais(rtd, j, codec_dai) {
+				ret = snd_soc_dai_set_channel_map(codec_dai,
+								  tx_ch_cnt, tx_ch,
+								  rx_ch_cnt, rx_ch);
+				if (ret != 0 && ret != -ENOTSUPP)
+					goto err_set_stream;
+			}
 		}
 	}
 
-- 
2.25.1