| Message ID | 20230731094303.185067-5-krzysztof.kozlowski@linaro.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | d63cff2ba4d6cb9eed12508469bf8c1b207be4f1 |
| Headers | show |
| Series | ASoC: dt-bindings: Add sound-card-common.yaml | expand |
On Mon, 31 Jul 2023 11:42:55 +0200, Krzysztof Kozlowski wrote: > Reference the common sound card properties and deprecate the > custom "samsung,audio-routing" in favor of generic one. This allows to > remove "model" property and make the binding closer to other sounds > cards. > > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > --- > .../bindings/sound/samsung,aries-wm8994.yaml | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check' on your patch (DT_CHECKER_FLAGS is new in v5.13): yamllint warnings/errors: dtschema/dtc warnings/errors: /builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/sound/samsung,aries-wm8994.yaml: Error in referenced schema matching $id: http://devicetree.org/schemas/sound/sound-card-common.yaml /builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/sound/samsung,aries-wm8994.example.dtb: sound: False schema does not allow {'compatible': ['samsung,fascinate4g-wm8994'], 'model': ['Fascinate4G'], 'extcon': [[4294967295]], 'main-micbias-supply': [[4294967295]], 'headset-micbias-supply': [[4294967295]], 'earpath-sel-gpios': [[4294967295, 6, 0]], 'io-channels': [[4294967295, 3]], 'io-channel-names': ['headset-detect'], 'headset-detect-gpios': [[4294967295, 6, 0]], 'headset-key-gpios': [[4294967295, 6, 0]], 'audio-routing': ['HP', 'HPOUT1L', 'HP', 'HPOUT1R', 'SPK', 'SPKOUTLN', 'SPK', 'SPKOUTLP', 'RCV', 'HPOUT2N', 'RCV', 'HPOUT2P', 'LINE', 'LINEOUT2N', 'LINE', 'LINEOUT2P', 'IN1LP', 'Main Mic', 'IN1LN', 'Main Mic', 'IN1RP', 'Headset Mic', 'IN1RN', 'Headset Mic'], 'pinctrl-names': ['default'], 'pinctrl-0': [[4294967295, 4294967295]], 'cpu': {'sound-dai': [[4294967295], [4294967295]]}, 'codec': {'sound-dai': [[4294967295]]}, '$nodename': ['sound']} from schema $id: http://devicetree.org/schemas/sound/samsung,aries-wm8994.yaml# /builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/sound/samsung,aries-wm8994.example.dtb: sound: Unevaluated properties are not allowed ('audio-routing', 'model' were unexpected) from schema $id: http://devicetree.org/schemas/sound/samsung,aries-wm8994.yaml# doc reference errors (make refcheckdocs): See https://patchwork.ozlabs.org/project/devicetree-bindings/patch/20230731094303.185067-5-krzysztof.kozlowski@linaro.org The base for the series is generally the latest rc1. A different dependency should be noted in *this* patch. If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure 'yamllint' is installed and dt-schema is up to date: pip3 install dtschema --upgrade Please check and re-submit after running the above command yourself. Note that DT_SCHEMA_FILES can be set to your schema file to speed up checking your schema. However, it must be unset to test all examples with your schema.
On Mon, 31 Jul 2023 11:42:55 +0200, Krzysztof Kozlowski wrote: > Reference the common sound card properties and deprecate the > custom "samsung,audio-routing" in favor of generic one. This allows to > remove "model" property and make the binding closer to other sounds > cards. > > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > --- > .../bindings/sound/samsung,aries-wm8994.yaml | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > Reviewed-by: Rob Herring <robh@kernel.org>
diff --git a/Documentation/devicetree/bindings/sound/samsung,aries-wm8994.yaml b/Documentation/devicetree/bindings/sound/samsung,aries-wm8994.yaml index 447e013f6e17..5ea0819a261a 100644 --- a/Documentation/devicetree/bindings/sound/samsung,aries-wm8994.yaml +++ b/Documentation/devicetree/bindings/sound/samsung,aries-wm8994.yaml @@ -9,6 +9,9 @@ title: Samsung Aries audio complex with WM8994 codec maintainers: - Jonathan Bakker <xc-racer2@live.ca> +allOf: + - $ref: sound-card-common.yaml# + properties: compatible: enum: @@ -17,10 +20,6 @@ properties: # Without FM radio and modem slave - samsung,fascinate4g-wm8994 - model: - $ref: /schemas/types.yaml#/definitions/string - description: The user-visible name of this sound complex. - cpu: type: object additionalProperties: false @@ -46,6 +45,7 @@ properties: samsung,audio-routing: $ref: /schemas/types.yaml#/definitions/non-unique-string-array + deprecated: true description: | List of the connections between audio components; each entry is a pair of strings, the first being the @@ -56,6 +56,7 @@ properties: or FM In For samsung,fascinate4g-wm8994: HP, SPK, RCV, LINE, Main Mic, or HeadsetMic + Deprecated, use audio-routing. extcon: description: Extcon phandle for dock detection @@ -87,10 +88,9 @@ properties: required: - compatible - - model - cpu - codec - - samsung,audio-routing + - audio-routing - extcon - main-micbias-supply - headset-micbias-supply @@ -98,7 +98,7 @@ required: - headset-detect-gpios - headset-key-gpios -additionalProperties: false +unevaluatedProperties: false examples: - | @@ -121,7 +121,7 @@ examples: headset-detect-gpios = <&gph0 6 GPIO_ACTIVE_HIGH>; headset-key-gpios = <&gph3 6 GPIO_ACTIVE_HIGH>; - samsung,audio-routing = + audio-routing = "HP", "HPOUT1L", "HP", "HPOUT1R",
Reference the common sound card properties and deprecate the custom "samsung,audio-routing" in favor of generic one. This allows to remove "model" property and make the binding closer to other sounds cards. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> --- .../bindings/sound/samsung,aries-wm8994.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)