Message ID | 20201103103051.34553-2-ajye_huang@compal.corp-partner.google.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [v5,1/2] ASoC: google: dt-bindings: modify machine bindings for two MICs case | expand |
Hi Rob, Could you please kindly review this patch ? I had got your "reviewed-by" on v1 patch, the v1 depends on this patch series (https://patchwork.kernel.org/patch/11773221) at that time. Now, that patch what I depended (11773221) had made modification and it was Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next commit e158d2d83cab ("ASoC: google: dt-bindings: Add sc7180-trogdor machine bindings") I noted what I did on cover letter v2: - Documentation: Modify the dimc-gpios property description and examples. That is why I bother you again to review it. Please let me know if this looks good to you. Thanks! On Tue, Nov 3, 2020 at 6:31 PM Ajye Huang <ajye.huang@gmail.com> wrote: > > Add a property "dmic-gpios" for switching between two MICs. > > Signed-off-by: Ajye Huang <ajye_huang@compal.corp-partner.google.com> > --- > .../bindings/sound/google,sc7180-trogdor.yaml | 58 +++++++++++++++++++ > 1 file changed, 58 insertions(+) > > diff --git a/Documentation/devicetree/bindings/sound/google,sc7180-trogdor.yaml b/Documentation/devicetree/bindings/sound/google,sc7180-trogdor.yaml > index efc34689d6b5..9e0505467e57 100644 > --- a/Documentation/devicetree/bindings/sound/google,sc7180-trogdor.yaml > +++ b/Documentation/devicetree/bindings/sound/google,sc7180-trogdor.yaml > @@ -34,6 +34,9 @@ properties: > "#size-cells": > const: 0 > > + dmic-gpios: > + description: GPIO for switching between DMICs > + > patternProperties: > "^dai-link(@[0-9])?$": > description: > @@ -81,6 +84,7 @@ additionalProperties: false > examples: > > - | > + //Example 1 > sound { > compatible = "google,sc7180-trogdor"; > model = "sc7180-rt5682-max98357a-1mic"; > @@ -128,3 +132,57 @@ examples: > }; > }; > }; > + > + - | > + //Example 2 (2mic case) > + sound { > + compatible = "google,sc7180-trogdor"; > + model = "sc7180-rt5682-max98357a-2mic"; > + > + 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>; > + }; > + }; > + }; > + > +... > -- > 2.25.1 >
On Tue, Nov 03, 2020 at 06:30:50PM +0800, Ajye Huang wrote: > Add a property "dmic-gpios" for switching between two MICs. > > Signed-off-by: Ajye Huang <ajye_huang@compal.corp-partner.google.com> > --- > .../bindings/sound/google,sc7180-trogdor.yaml | 58 +++++++++++++++++++ > 1 file changed, 58 insertions(+) > > diff --git a/Documentation/devicetree/bindings/sound/google,sc7180-trogdor.yaml b/Documentation/devicetree/bindings/sound/google,sc7180-trogdor.yaml > index efc34689d6b5..9e0505467e57 100644 > --- a/Documentation/devicetree/bindings/sound/google,sc7180-trogdor.yaml > +++ b/Documentation/devicetree/bindings/sound/google,sc7180-trogdor.yaml > @@ -34,6 +34,9 @@ properties: > "#size-cells": > const: 0 > > + dmic-gpios: > + description: GPIO for switching between DMICs Need to define how many (maxItems: 1). > + > patternProperties: > "^dai-link(@[0-9])?$": > description: > @@ -81,6 +84,7 @@ additionalProperties: false > examples: > > - | > + //Example 1 > sound { > compatible = "google,sc7180-trogdor"; > model = "sc7180-rt5682-max98357a-1mic"; > @@ -128,3 +132,57 @@ examples: > }; > }; > }; > + > + - | > + //Example 2 (2mic case) > + sound { > + compatible = "google,sc7180-trogdor"; > + model = "sc7180-rt5682-max98357a-2mic"; > + > + audio-routing = > + "Headphone Jack", "HPOL", > + "Headphone Jack", "HPOR"; > + > + #address-cells = <1>; > + #size-cells = <0>; > + > + dmic-gpios = <&tlmm 86 0>; Do we really need another example for this? Can't you just add it to the existing example? > + > + 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>; > + }; > + }; > + }; > + > +... > -- > 2.25.1 >
HI, Rob, Thank you for the comments. On Fri, Nov 6, 2020 at 2:43 AM Rob Herring <robh@kernel.org> wrote: > > On Tue, Nov 03, 2020 at 06:30:50PM +0800, Ajye Huang wrote: > > Add a property "dmic-gpios" for switching between two MICs. > > > > Signed-off-by: Ajye Huang <ajye_huang@compal.corp-partner.google.com> > > --- > > .../bindings/sound/google,sc7180-trogdor.yaml | 58 +++++++++++++++++++ > > 1 file changed, 58 insertions(+) > > > > diff --git a/Documentation/devicetree/bindings/sound/google,sc7180-trogdor.yaml b/Documentation/devicetree/bindings/sound/google,sc7180-trogdor.yaml > > index efc34689d6b5..9e0505467e57 100644 > > --- a/Documentation/devicetree/bindings/sound/google,sc7180-trogdor.yaml > > +++ b/Documentation/devicetree/bindings/sound/google,sc7180-trogdor.yaml > > @@ -34,6 +34,9 @@ properties: > > "#size-cells": > > const: 0 > > > > + dmic-gpios: > > + description: GPIO for switching between DMICs > > Need to define how many (maxItems: 1). Yes, I will add in the v6 version. > > > + > > patternProperties: > > "^dai-link(@[0-9])?$": > > description: > > @@ -81,6 +84,7 @@ additionalProperties: false > > examples: > > > > - | > > + //Example 1 > > sound { > > compatible = "google,sc7180-trogdor"; > > model = "sc7180-rt5682-max98357a-1mic"; > > @@ -128,3 +132,57 @@ examples: > > }; > > }; > > }; > > + > > + - | > > + //Example 2 (2mic case) > > + sound { > > + compatible = "google,sc7180-trogdor"; > > + model = "sc7180-rt5682-max98357a-2mic"; > > + > > + audio-routing = > > + "Headphone Jack", "HPOL", > > + "Headphone Jack", "HPOR"; > > + > > + #address-cells = <1>; > > + #size-cells = <0>; > > + > > + dmic-gpios = <&tlmm 86 0>; > > Do we really need another example for this? Can't you just add it to the > existing example? I think just keep One example. I will remove the example2 and put dmic-gpios = <&tlmm 86 0>; in the first example and modify the model from "sc7180-rt5682-max98357a-1mic" to "sc7180-rt5682-max98357a-2mic". It looks clear. > > > + > > + 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>; > > + }; > > + }; > > + }; > > + > > +... > > -- > > 2.25.1 > >
diff --git a/Documentation/devicetree/bindings/sound/google,sc7180-trogdor.yaml b/Documentation/devicetree/bindings/sound/google,sc7180-trogdor.yaml index efc34689d6b5..9e0505467e57 100644 --- a/Documentation/devicetree/bindings/sound/google,sc7180-trogdor.yaml +++ b/Documentation/devicetree/bindings/sound/google,sc7180-trogdor.yaml @@ -34,6 +34,9 @@ properties: "#size-cells": const: 0 + dmic-gpios: + description: GPIO for switching between DMICs + patternProperties: "^dai-link(@[0-9])?$": description: @@ -81,6 +84,7 @@ additionalProperties: false examples: - | + //Example 1 sound { compatible = "google,sc7180-trogdor"; model = "sc7180-rt5682-max98357a-1mic"; @@ -128,3 +132,57 @@ examples: }; }; }; + + - | + //Example 2 (2mic case) + sound { + compatible = "google,sc7180-trogdor"; + model = "sc7180-rt5682-max98357a-2mic"; + + 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 a property "dmic-gpios" for switching between two MICs. Signed-off-by: Ajye Huang <ajye_huang@compal.corp-partner.google.com> --- .../bindings/sound/google,sc7180-trogdor.yaml | 58 +++++++++++++++++++ 1 file changed, 58 insertions(+)