| Message ID | 20240909105547.2691015-1-quic_mohs@quicinc.com |
|---|---|
| Headers | show |
| Series | Add static channel mapping between soundwire master and slave | expand |
On Mon, Sep 09, 2024 at 04:25:44PM +0530, Mohammad Rafi Shaik wrote: > Add static channel mapping between master and slave rx/tx ports. > I see ongoing discussion, so if these property stay, grow the description here to explain how this describes hardware or which part of hardware you are covering. > Signed-off-by: Mohammad Rafi Shaik <quic_mohs@quicinc.com> > --- > .../bindings/sound/qcom,wcd937x-sdw.yaml | 28 +++++++++++++++++++ > 1 file changed, 28 insertions(+) Best regards, Krzysztof
On Mon, Sep 09, 2024 at 04:25:44PM GMT, Mohammad Rafi Shaik wrote: > Add static channel mapping between master and slave rx/tx ports. > > Signed-off-by: Mohammad Rafi Shaik <quic_mohs@quicinc.com> > --- > .../bindings/sound/qcom,wcd937x-sdw.yaml | 28 +++++++++++++++++++ > 1 file changed, 28 insertions(+) > > diff --git a/Documentation/devicetree/bindings/sound/qcom,wcd937x-sdw.yaml b/Documentation/devicetree/bindings/sound/qcom,wcd937x-sdw.yaml > index d3cf8f59cb23..1db3c001ce98 100644 > --- a/Documentation/devicetree/bindings/sound/qcom,wcd937x-sdw.yaml > +++ b/Documentation/devicetree/bindings/sound/qcom,wcd937x-sdw.yaml > @@ -58,6 +58,30 @@ 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, adc4, > + dmic0, dmic1, mbhc, dmic2, dmic3, dmci4, dmic5, dmic6, dmic7. > + $ref: /schemas/types.yaml#/definitions/uint8-array > + minItems: 8 > + maxItems: 13 > + 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. > + $ref: /schemas/types.yaml#/definitions/uint8-array > + minItems: 8 > + maxItems: 8 > + items: > + enum: [1, 2, 4, 8] Can we please use sensible strings instead of a randomly-looking numbers? > + > required: > - compatible > - reg > @@ -74,6 +98,8 @@ examples: > compatible = "sdw20217010a00"; > reg = <0 4>; > qcom,rx-port-mapping = <1 2 3 4 5>; > + qcom,rx-channel-mapping = /bits/ 8 <0x01 0x02 0x01 0x01 0x02 > + 0x01 0x01 0x02>; > }; > }; > > @@ -85,6 +111,8 @@ examples: > compatible = "sdw20217010a00"; > reg = <0 3>; > qcom,tx-port-mapping = <2 2 3 4>; > + qcom,tx-channel-mapping = /bits/ 8 <0x01 0x02 0x01 0x01 0x02 0x04 > + 0x04 0x08 0x01 0x02 0x04 0x8>; > }; > }; > > -- > 2.25.1 >
Add static channel map support between soundwire master and slave. This patch series will resolve channel mask mismatch between master and slave. Scenario: wcd937x AMIC2 usecase Master Slave (wcd937x) +--------------+ +--------------+ | +--------+ | | +--------+ | AMIC1 ----->| | PORT1 | | | | TX1 | |<-----------AMIC1 AMIC2 ----->| | | | | | | | | +--------+ | | +--------+ | | | | | AMIC3 ----->| +--------+ | | +--------+ | | | PORT2 | | | | TX2 | |<-----------AMIC2 | | | | | | | |<-----------AMIC3 | +--------+ | | +--------+ | | | | | | +--------+ | | +--------+ | DMIC0...DMIC3------>| | PORT3 | | | | TX3 | |<-----------DMIC0...DMIC3 | | | | | | | |<-----------MBHC | +--------+ | | +--------+ | | | | | | +--------+ | | +--------+ | DMIC4...DMIC37----->| | PORT4 | | | | TX4 | |<-----------DMIC4...DMIC7 | | | | | | | | | +--------+ | | +--------+ | | | | | +------------- + +--------------+ For AMIC2 usecase, The Slave need to configure TX2 Port with channel mask 1 and for Master required PORT1 with channel mask 2, In existing design master and slave configured with same channel mask, it will fail AMIC2 usecase. The New design will help to configure channel mapping between master and slave from device tree. Mohammad Rafi Shaik (4): ASoC: dt-bindings: wcd938x-sdw: Add static channel mapping support soundwire: stream: Add set_master_channel_map() to set static channel mapping soundwire: qcom: Add static channel mapping support in soundwire master ASoC: codecs: wcd937x: Add static channel mapping support in wcd937x-sdw .../bindings/sound/qcom,wcd937x-sdw.yaml | 28 ++++++++++ drivers/soundwire/qcom.c | 18 +++++++ drivers/soundwire/stream.c | 16 ++++++ include/linux/soundwire/sdw.h | 5 ++ sound/soc/codecs/wcd937x-sdw.c | 52 ++++++++++++++++--- sound/soc/codecs/wcd937x.c | 12 ++++- sound/soc/codecs/wcd937x.h | 6 ++- 7 files changed, 126 insertions(+), 11 deletions(-) base-commit: 9aaeb87ce1e966169a57f53a02ba05b30880ffb8