| Message ID | 20240716-midas-audio-tab3-v1-1-a53ea075af5a@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ASoC: samsung: midas_wm1811: Separate compatible for tab3 + fixes | expand |
On 16/07/2024 21:36, Artur Weber wrote: > GPIO jack detection requires an IIO channel and the detection threshold > to work. Explicitly declare the requirement in DT schema. > > Fixes: 0a590ecc672a ("ASoC: dt-bindings: samsung,midas-audio: Add GPIO-based headset jack detection") > Signed-off-by: Artur Weber <aweber.kernel@gmail.com> > --- > .../bindings/sound/samsung,midas-audio.yaml | 29 +++++++++++++++++++--- > 1 file changed, 26 insertions(+), 3 deletions(-) > > diff --git a/Documentation/devicetree/bindings/sound/samsung,midas-audio.yaml b/Documentation/devicetree/bindings/sound/samsung,midas-audio.yaml > index 69ddfd4afdcd..e7af3c09de38 100644 > --- a/Documentation/devicetree/bindings/sound/samsung,midas-audio.yaml > +++ b/Documentation/devicetree/bindings/sound/samsung,midas-audio.yaml > @@ -9,9 +9,6 @@ title: Samsung Midas audio complex with WM1811 codec > maintainers: > - Sylwester Nawrocki <s.nawrocki@samsung.com> > > -allOf: > - - $ref: sound-card-common.yaml# > - > properties: > compatible: > const: samsung,midas-audio > @@ -102,6 +99,32 @@ required: > - mic-bias-supply > - submic-bias-supply > > +allOf: > + - $ref: sound-card-common.yaml# > + > + - if: > + oneOf: This won't work if you have both detect and key gpios. I think you want anyOf here. Best regards, Krzysztof
diff --git a/Documentation/devicetree/bindings/sound/samsung,midas-audio.yaml b/Documentation/devicetree/bindings/sound/samsung,midas-audio.yaml index 69ddfd4afdcd..e7af3c09de38 100644 --- a/Documentation/devicetree/bindings/sound/samsung,midas-audio.yaml +++ b/Documentation/devicetree/bindings/sound/samsung,midas-audio.yaml @@ -9,9 +9,6 @@ title: Samsung Midas audio complex with WM1811 codec maintainers: - Sylwester Nawrocki <s.nawrocki@samsung.com> -allOf: - - $ref: sound-card-common.yaml# - properties: compatible: const: samsung,midas-audio @@ -102,6 +99,32 @@ required: - mic-bias-supply - submic-bias-supply +allOf: + - $ref: sound-card-common.yaml# + + - if: + oneOf: + - required: [ headset-detect-gpios ] + - required: [ headset-key-gpios ] + then: + required: + - io-channels + - io-channel-names + + - if: + required: + - headset-detect-gpios + then: + required: + - samsung,headset-4pole-threshold-microvolt + + - if: + required: + - headset-key-gpios + then: + required: + - samsung,headset-button-threshold-microvolt + unevaluatedProperties: false examples:
GPIO jack detection requires an IIO channel and the detection threshold to work. Explicitly declare the requirement in DT schema. Fixes: 0a590ecc672a ("ASoC: dt-bindings: samsung,midas-audio: Add GPIO-based headset jack detection") Signed-off-by: Artur Weber <aweber.kernel@gmail.com> --- .../bindings/sound/samsung,midas-audio.yaml | 29 +++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-)