| Message ID | 20250320115633.4248-1-srinivas.kandagatla@linaro.org |
|---|---|
| Headers | show |
| Series | ASoC: wcd938x: enable t14s audio headset | expand |
On 20/03/2025 12:56, srinivas.kandagatla@linaro.org wrote: > From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> > > On some platforms to minimise pop and click during switching between > CTIA and OMTP headset an additional HiFi Mux Switch is used. Most common > case is that this switch is switched on by default, but on some > platforms this needs a regulator enable. One such platform is Lenovo > T14s. > > This patch adds required bindings in gpio-mux to add such optional regulator. > > Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> > --- > Documentation/devicetree/bindings/mux/gpio-mux.yaml | 4 ++++ > 1 file changed, 4 insertions(+) > Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Best regards, Krzysztof
On 21/03/2025 09:29, Krzysztof Kozlowski wrote: > On 20/03/2025 12:56, srinivas.kandagatla@linaro.org wrote: >> diff --git a/Documentation/devicetree/bindings/sound/qcom,wcd938x.yaml b/Documentation/devicetree/bindings/sound/qcom,wcd938x.yaml >> index 10531350c336..e7aa00a9c59a 100644 >> --- a/Documentation/devicetree/bindings/sound/qcom,wcd938x.yaml >> +++ b/Documentation/devicetree/bindings/sound/qcom,wcd938x.yaml >> @@ -23,8 +23,13 @@ properties: >> - qcom,wcd9380-codec >> - qcom,wcd9385-codec >> >> + mux-controls: >> + description: A reference to the audio mux switch for >> + switching CTIA/OMTP Headset types >> + >> us-euro-gpios: >> - description: GPIO spec for swapping gnd and mic segments >> + description: GPIO spec for swapping gnd and mic segments. >> + This property is considered obsolete, recommended to use mux-controls. >> maxItems: 1 > > > Assuming intention is to really obsolete/deprecate, then please add: > > deprecated: true Thanks, I was looking for this flag.. v3 will fix this. --srini > > > > > Best regards, > Krzysztof
On Fri, 21 Mar 2025 at 14:35, Srinivas Kandagatla <srinivas.kandagatla@linaro.org> wrote: > > > > On 20/03/2025 14:03, Dmitry Baryshkov wrote: > > On Thu, Mar 20, 2025 at 11:56:32AM +0000, srinivas.kandagatla@linaro.org wrote: > >> From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> > >> > >> On some platforms to minimise pop and click during switching between > >> CTIA and OMTP headset an additional HiFi mux is used. Most common > >> case is that this switch is switched on by default, but on some > >> platforms this needs a regulator enable. > >> > >> move to using mux control to enable both regulator and handle gpios, > >> deprecate the usage of gpio. > >> > >> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> > >> --- > >> sound/soc/codecs/Kconfig | 2 ++ > >> sound/soc/codecs/wcd938x.c | 38 ++++++++++++++++++++++++++++++-------- > >> 2 files changed, 32 insertions(+), 8 deletions(-) > >> > >> diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig > >> index ee35f3aa5521..b04076282c8b 100644 > >> --- a/sound/soc/codecs/Kconfig > >> +++ b/sound/soc/codecs/Kconfig > >> @@ -2226,6 +2226,8 @@ config SND_SOC_WCD938X > >> tristate > >> depends on SOUNDWIRE || !SOUNDWIRE > >> select SND_SOC_WCD_CLASSH > >> + select MULTIPLEXER > >> + imply MUX_GPIO > > > > Why? This is true for a particular platform, isn't it? > > We want to move the codec to use gpio mux instead of using gpios directly > > So this become codec specific, rather than platform. Not quite. "select MULTIPLEXER" is correct and is not questionable. I'm asking about the MUX_GPIO. The codec itself has nothing to do with the board using _GPIO_ to switch 4-pin modes. It is a board-level decision. A board can use an I2C-controlled MUX instead. I'd say, that at least you should describe rationale for this `imply` clause in the commit message.
On 21/03/2025 13:16, Dmitry Baryshkov wrote: > On Fri, 21 Mar 2025 at 14:35, Srinivas Kandagatla > <srinivas.kandagatla@linaro.org> wrote: >> >> >> >> On 20/03/2025 14:03, Dmitry Baryshkov wrote: >>> On Thu, Mar 20, 2025 at 11:56:32AM +0000, srinivas.kandagatla@linaro.org wrote: >>>> From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> >>>> >>>> On some platforms to minimise pop and click during switching between >>>> CTIA and OMTP headset an additional HiFi mux is used. Most common >>>> case is that this switch is switched on by default, but on some >>>> platforms this needs a regulator enable. >>>> >>>> move to using mux control to enable both regulator and handle gpios, >>>> deprecate the usage of gpio. >>>> >>>> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> >>>> --- >>>> sound/soc/codecs/Kconfig | 2 ++ >>>> sound/soc/codecs/wcd938x.c | 38 ++++++++++++++++++++++++++++++-------- >>>> 2 files changed, 32 insertions(+), 8 deletions(-) >>>> >>>> diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig >>>> index ee35f3aa5521..b04076282c8b 100644 >>>> --- a/sound/soc/codecs/Kconfig >>>> +++ b/sound/soc/codecs/Kconfig >>>> @@ -2226,6 +2226,8 @@ config SND_SOC_WCD938X >>>> tristate >>>> depends on SOUNDWIRE || !SOUNDWIRE >>>> select SND_SOC_WCD_CLASSH >>>> + select MULTIPLEXER >>>> + imply MUX_GPIO >>> >>> Why? This is true for a particular platform, isn't it? >> >> We want to move the codec to use gpio mux instead of using gpios directly >> >> So this become codec specific, rather than platform. > > Not quite. "select MULTIPLEXER" is correct and is not questionable. > I'm asking about the MUX_GPIO. The codec itself has nothing to do with > the board using _GPIO_ to switch 4-pin modes. It is a board-level > decision. A board can use an I2C-controlled MUX instead. I'd say, that > at least you should describe rationale for this `imply` clause in the > commit message. I agree to you point, but historically in this case us/euro selection is only driven by gpio. But I see no harm in moving the MUX_GPIO dependency to machine driver KConfigs. Will fix this in v3. thanks, Srini >
On Fri, Mar 21, 2025 at 01:26:44PM +0000, Srinivas Kandagatla wrote: > > > On 21/03/2025 13:16, Dmitry Baryshkov wrote: > > On Fri, 21 Mar 2025 at 14:35, Srinivas Kandagatla > > <srinivas.kandagatla@linaro.org> wrote: > > > > > > > > > > > > On 20/03/2025 14:03, Dmitry Baryshkov wrote: > > > > On Thu, Mar 20, 2025 at 11:56:32AM +0000, srinivas.kandagatla@linaro.org wrote: > > > > > From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> > > > > > > > > > > On some platforms to minimise pop and click during switching between > > > > > CTIA and OMTP headset an additional HiFi mux is used. Most common > > > > > case is that this switch is switched on by default, but on some > > > > > platforms this needs a regulator enable. > > > > > > > > > > move to using mux control to enable both regulator and handle gpios, > > > > > deprecate the usage of gpio. > > > > > > > > > > Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> > > > > > --- > > > > > sound/soc/codecs/Kconfig | 2 ++ > > > > > sound/soc/codecs/wcd938x.c | 38 ++++++++++++++++++++++++++++++-------- > > > > > 2 files changed, 32 insertions(+), 8 deletions(-) > > > > > > > > > > diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig > > > > > index ee35f3aa5521..b04076282c8b 100644 > > > > > --- a/sound/soc/codecs/Kconfig > > > > > +++ b/sound/soc/codecs/Kconfig > > > > > @@ -2226,6 +2226,8 @@ config SND_SOC_WCD938X > > > > > tristate > > > > > depends on SOUNDWIRE || !SOUNDWIRE > > > > > select SND_SOC_WCD_CLASSH > > > > > + select MULTIPLEXER > > > > > + imply MUX_GPIO > > > > > > > > Why? This is true for a particular platform, isn't it? > > > > > > We want to move the codec to use gpio mux instead of using gpios directly > > > > > > So this become codec specific, rather than platform. > > > > Not quite. "select MULTIPLEXER" is correct and is not questionable. > > I'm asking about the MUX_GPIO. The codec itself has nothing to do with > > the board using _GPIO_ to switch 4-pin modes. It is a board-level > > decision. A board can use an I2C-controlled MUX instead. I'd say, that > > at least you should describe rationale for this `imply` clause in the > > commit message. > > I agree to you point, but historically in this case us/euro selection is > only driven by gpio. But I see no harm in moving the MUX_GPIO dependency to > machine driver KConfigs. Machine driver also doesn't depend on it. MUX_GPIO is selectedable item, so please handle it via the usual way - defconfig.
On Thu, Mar 20, 2025 at 11:56:31AM +0000, srinivas.kandagatla@linaro.org wrote: > From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> > > On some platforms to minimise pop and click during switching between > CTIA and OMTP headset an additional HiFi mux is used. Most common > case is that this switch is switched on by default, but on some > platforms this needs a regulator enable. > > Move to using mux-controls so that both the gpio and regulators can be > driven correctly, rather than adding regulator handing in the codec. > > This patch adds required bindings to add such mux controls. > > Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> > --- > Documentation/devicetree/bindings/sound/qcom,wcd938x.yaml | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/Documentation/devicetree/bindings/sound/qcom,wcd938x.yaml b/Documentation/devicetree/bindings/sound/qcom,wcd938x.yaml > index 10531350c336..e7aa00a9c59a 100644 > --- a/Documentation/devicetree/bindings/sound/qcom,wcd938x.yaml > +++ b/Documentation/devicetree/bindings/sound/qcom,wcd938x.yaml > @@ -23,8 +23,13 @@ properties: > - qcom,wcd9380-codec > - qcom,wcd9385-codec > > + mux-controls: > + description: A reference to the audio mux switch for > + switching CTIA/OMTP Headset types maxItems: 1 > + > us-euro-gpios: > - description: GPIO spec for swapping gnd and mic segments > + description: GPIO spec for swapping gnd and mic segments. > + This property is considered obsolete, recommended to use mux-controls. > maxItems: 1 > > required: > -- > 2.39.5 >
From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> On Lenovo ThinkPad T14s, the headset is connected via a HiFi Switch to support CTIA and OMTP headsets. This switch is used to minimise pop and click during headset type switching. This patchset adds required bindings and changes to codec and dts to tnable the regulator required to power this switch along with wiring up gpio that control the headset switching. Without this patchset, there will be lots of noise on headset and mic will not we functional. Changes since v1: - moved to using mux-controls. - fixed typo in regulator naming. Srinivas Kandagatla (5): dt-bindings: mux: add optional regulator binding to gpio mux mux: gpio: add optional regulator support ASoC: dt-bindings: wcd93xx: add bindings for audio mux controlling hp ASoC: codecs: wcd938x: add mux control support for hp audio mux arm64: dts: qcom: x1e78100-t14s: Enable audio headset support .../devicetree/bindings/mux/gpio-mux.yaml | 4 ++ .../bindings/sound/qcom,wcd938x.yaml | 7 +++- .../qcom/x1e78100-lenovo-thinkpad-t14s.dts | 25 ++++++++++++ drivers/mux/gpio.c | 8 ++++ sound/soc/codecs/Kconfig | 2 + sound/soc/codecs/wcd938x.c | 38 +++++++++++++++---- 6 files changed, 75 insertions(+), 9 deletions(-)