| Message ID | 20200928063744.525700-2-ajye_huang@compal.corp-partner.google.com |
|---|---|
| State | New |
| Headers | show |
| Series | Modify documentation and machine driver for SC7180 sound card | expand |
On Mon, 28 Sep 2020 14:37:43 +0800, Ajye Huang wrote: > Add compatible "qcom,sc7180-sndcard-rt5682-m98357-2mic" > for 2mic case. > > Signed-off-by: Ajye Huang <ajye_huang@compal.corp-partner.google.com> > --- > This patch depends on this patch series > https://patchwork.kernel.org/patch/11773221/ . > > .../bindings/sound/qcom,sc7180.yaml | 64 ++++++++++++++++++- > 1 file changed, 63 insertions(+), 1 deletion(-) > Reviewed-by: Rob Herring <robh@kernel.org>
On Mon, Sep 28, 2020 at 02:37:43PM +0800, Ajye Huang wrote: > Add compatible "qcom,sc7180-sndcard-rt5682-m98357-2mic" > for 2mic case. This doesn't apply against current code, please check and resend.
On Fri, Oct 9, 2020 at 9:52 PM Mark Brown <broonie@kernel.org> wrote: > > On Mon, Sep 28, 2020 at 02:37:43PM +0800, Ajye Huang wrote: > > Add compatible "qcom,sc7180-sndcard-rt5682-m98357-2mic" > > for 2mic case. > > This doesn't apply against current code, please check and resend. Hi, Mark Thank you for your reply, This patch depends on Cheng-Yi's patch series https://patchwork.kernel.org/patch/11773221/. If I misunderstand what you mean, please correct me, Thank you,
On Sat, Oct 10, 2020 at 12:07:54AM +0800, Ajye Huang wrote: > On Fri, Oct 9, 2020 at 9:52 PM Mark Brown <broonie@kernel.org> wrote: > > On Mon, Sep 28, 2020 at 02:37:43PM +0800, Ajye Huang wrote: > > > Add compatible "qcom,sc7180-sndcard-rt5682-m98357-2mic" > > > for 2mic case. > > This doesn't apply against current code, please check and resend. > Thank you for your reply, > This patch depends on Cheng-Yi's patch series > https://patchwork.kernel.org/patch/11773221/. That's "ASoC: qcom: dt-bindings: Add sc7180 machine bindings" for those playing at home. > If I misunderstand what you mean, please correct me, A version of some SC7180 patches was applied. However it does seem like that didn't include any machine driver bindings so it must've been a different, similar looking series which is presumably waiting for a new version - please resend based on that new version (ideally these patches could be picked up as part of that series). Please include human readable descriptions of things like commits and issues being discussed in e-mail in your mails, this makes them much easier for humans to read especially when they have no internet access. I do frequently catch up on my mail on flights or while otherwise travelling so this is even more pressing for me than just being about making things a bit easier to read.
On Mon, Oct 12, 2020 at 9:50 PM Mark Brown <broonie@kernel.org> wrote: > > On Sat, Oct 10, 2020 at 12:07:54AM +0800, Ajye Huang wrote: > > On Fri, Oct 9, 2020 at 9:52 PM Mark Brown <broonie@kernel.org> wrote: > > > On Mon, Sep 28, 2020 at 02:37:43PM +0800, Ajye Huang wrote: > > > > > Add compatible "qcom,sc7180-sndcard-rt5682-m98357-2mic" > > > > for 2mic case. > > > > This doesn't apply against current code, please check and resend. > > > Thank you for your reply, > > This patch depends on Cheng-Yi's patch series > > https://patchwork.kernel.org/patch/11773221/. > > That's "ASoC: qcom: dt-bindings: Add sc7180 machine bindings" for those > playing at home. > > > If I misunderstand what you mean, please correct me, > > A version of some SC7180 patches was applied. However it does seem like > that didn't include any machine driver bindings so it must've been a > different, similar looking series which is presumably waiting for a new > version - please resend based on that new version (ideally these patches > could be picked up as part of that series). > > Please include human readable descriptions of things like commits and > issues being discussed in e-mail in your mails, this makes them much > easier for humans to read especially when they have no internet access. > I do frequently catch up on my mail on flights or while otherwise > travelling so this is even more pressing for me than just being about > making things a bit easier to read. Hi, Mark Thank you for your reply, I understand you point now, I will resend when it is done. thank you.
diff --git a/Documentation/devicetree/bindings/sound/qcom,sc7180.yaml b/Documentation/devicetree/bindings/sound/qcom,sc7180.yaml index b77311bb5190..ec84dbfc1bc9 100644 --- a/Documentation/devicetree/bindings/sound/qcom,sc7180.yaml +++ b/Documentation/devicetree/bindings/sound/qcom,sc7180.yaml @@ -15,7 +15,9 @@ description: properties: compatible: - const: qcom,sc7180-sndcard-rt5682-m98357-1mic + enum: + - qcom,sc7180-sndcard-rt5682-m98357-1mic + - qcom,sc7180-sndcard-rt5682-m98357-2mic audio-routing: $ref: /schemas/types.yaml#/definitions/non-unique-string-array @@ -34,6 +36,11 @@ properties: "#size-cells": const: 0 + dmic-gpios: + description: + GPIO for switching between DMICs, it is required when + compatible is "qcom,sc7180-sndcard-rt5682-m98357-2mic". + patternProperties: "^dai-link(@[0-9])?$": description: @@ -81,6 +88,7 @@ additionalProperties: false examples: - | + //Example 1 sound { compatible = "qcom,sc7180-sndcard-rt5682-m98357-1mic"; model = "sc7180-snd-card"; @@ -128,3 +136,57 @@ examples: }; }; }; + + - | + //Example 2 (2mic case) + sound { + compatible = "qcom,sc7180-sndcard-rt5682-m98357-2mic"; + model = "sc7180-snd-card"; + + audio-routing = + "Headphone Jack", "HPOL", + "Headphone Jack", "HPOR"; + + #address-cells = <1>; + #size-cells = <0>; + + dmic-gpios = <&tlmm 86 0>; + + dai-link@0 { + link-name = "MultiMedia0"; + reg = <0>; + cpu { + sound-dai = <&lpass_cpu 0>; + }; + + codec { + sound-dai = <&alc5682 0>; + }; + }; + + dai-link@1 { + link-name = "MultiMedia1"; + reg = <1>; + cpu { + sound-dai = <&lpass_cpu 1>; + }; + + codec { + sound-dai = <&max98357a>; + }; + }; + + dai-link@2 { + link-name = "MultiMedia2"; + reg = <2>; + cpu { + sound-dai = <&lpass_hdmi 0>; + }; + + codec { + sound-dai = <&msm_dp>; + }; + }; + }; + +...
Add compatible "qcom,sc7180-sndcard-rt5682-m98357-2mic" for 2mic case. Signed-off-by: Ajye Huang <ajye_huang@compal.corp-partner.google.com> --- This patch depends on this patch series https://patchwork.kernel.org/patch/11773221/ . .../bindings/sound/qcom,sc7180.yaml | 64 ++++++++++++++++++- 1 file changed, 63 insertions(+), 1 deletion(-)