| Message ID | 20220324053851.27350-4-trevor.wu@mediatek.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ASoC: mediatek: Add support for MT8195 sound card with max98390 and rt5682 | expand |
> Because the same binding components can be shared by all codecs > combinations, we only reserve one binding file for mt8195 machine driver > and rename to a generic name. > > We use compatible string to separate different codec combination instead > of creating a new binding file for new codec combination. > > Signed-off-by: Trevor Wu <trevor.wu@mediatek.com> >--- ...snip... >diff --git a/Documentation/devicetree/bindings/sound/mt8195-mt6359-rt1019-rt5682.yaml b/Documentation/devicetree/bindings/sound/mt8195-mt6359.yaml >similarity index 87% >rename from Documentation/devicetree/bindings/sound/mt8195-mt6359-rt1019-rt5682.yaml >rename to Documentation/devicetree/bindings/sound/mt8195-mt6359.yaml >index 8f177e02ad35..04953f5b44a4 100644 >--- a/Documentation/devicetree/bindings/sound/mt8195-mt6359-rt1019-rt5682.yaml >+++ b/Documentation/devicetree/bindings/sound/mt8195-mt6359.yaml >@@ -1,10 +1,10 @@ > # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > %YAML 1.2 > --- >-$id: http://devicetree.org/schemas/sound/mt8195-mt6359-rt1019-rt5682.yaml# >+$id: http://devicetree.org/schemas/sound/mt8195-mt6359.yaml# > $schema: http://devicetree.org/meta-schemas/core.yaml# > >-title: Mediatek MT8195 with MT6359, RT1019 and RT5682 ASoC sound card driver >+title: MediaTek MT8195 ASoC sound card driver > I also tested: 'make dt_binding_check DT_CHECKER_FLAGS=-m DT_SCHEMA_FILES=Documentation/devicetree/bindings/sound/mt8195-mt6359.yaml' and it wotks fine. Reviewed-by: Miles Chen <miles.chen@mediatek.com> > maintainers: > - Trevor Wu <trevor.wu@mediatek.com> >@@ -14,7 +14,9 @@ description: > > properties: > compatible: >- const: mediatek,mt8195_mt6359_rt1019_rt5682 >+ enum: >+ - mediatek,mt8195_mt6359_rt1019_rt5682 >+ - mediatek,mt8195_mt6359_rt1011_rt5682 > > model: > $ref: /schemas/types.yaml#/definitions/string >-- >2.18.0 > >
On Thu, 24 Mar 2022 13:38:48 +0800, Trevor Wu wrote: > Because the same binding components can be shared by all codecs > combinations, we only reserve one binding file for mt8195 machine driver > and rename to a generic name. > > We use compatible string to separate different codec combination instead > of creating a new binding file for new codec combination. > > Signed-off-by: Trevor Wu <trevor.wu@mediatek.com> > --- > .../sound/mt8195-mt6359-rt1011-rt5682.yaml | 51 ------------------- > ...-rt1019-rt5682.yaml => mt8195-mt6359.yaml} | 8 +-- > 2 files changed, 5 insertions(+), 54 deletions(-) > delete mode 100644 Documentation/devicetree/bindings/sound/mt8195-mt6359-rt1011-rt5682.yaml > rename Documentation/devicetree/bindings/sound/{mt8195-mt6359-rt1019-rt5682.yaml => mt8195-mt6359.yaml} (87%) > Reviewed-by: Rob Herring <robh@kernel.org>
diff --git a/Documentation/devicetree/bindings/sound/mt8195-mt6359-rt1011-rt5682.yaml b/Documentation/devicetree/bindings/sound/mt8195-mt6359-rt1011-rt5682.yaml deleted file mode 100644 index cf6ad7933e23..000000000000 --- a/Documentation/devicetree/bindings/sound/mt8195-mt6359-rt1011-rt5682.yaml +++ /dev/null @@ -1,51 +0,0 @@ -# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) -%YAML 1.2 ---- -$id: http://devicetree.org/schemas/sound/mt8195-mt6359-rt1011-rt5682.yaml# -$schema: http://devicetree.org/meta-schemas/core.yaml# - -title: Mediatek MT8195 with MT6359, RT1011 and RT5682 ASoC sound card driver - -maintainers: - - Trevor Wu <trevor.wu@mediatek.com> - -description: - This binding describes the MT8195 sound card with RT1011 and RT5682. - -properties: - compatible: - const: mediatek,mt8195_mt6359_rt1011_rt5682 - - model: - $ref: /schemas/types.yaml#/definitions/string - description: User specified audio sound card name - - mediatek,platform: - $ref: "/schemas/types.yaml#/definitions/phandle" - description: The phandle of MT8195 ASoC platform. - - mediatek,dptx-codec: - $ref: "/schemas/types.yaml#/definitions/phandle" - description: The phandle of MT8195 Display Port Tx codec node. - - mediatek,hdmi-codec: - $ref: "/schemas/types.yaml#/definitions/phandle" - description: The phandle of MT8195 HDMI codec node. - -additionalProperties: false - -required: - - compatible - - mediatek,platform - -examples: - - | - - sound: mt8195-sound { - compatible = "mediatek,mt8195_mt6359_rt1011_rt5682"; - mediatek,platform = <&afe>; - pinctrl-names = "default"; - pinctrl-0 = <&aud_pins_default>; - }; - -... diff --git a/Documentation/devicetree/bindings/sound/mt8195-mt6359-rt1019-rt5682.yaml b/Documentation/devicetree/bindings/sound/mt8195-mt6359.yaml similarity index 87% rename from Documentation/devicetree/bindings/sound/mt8195-mt6359-rt1019-rt5682.yaml rename to Documentation/devicetree/bindings/sound/mt8195-mt6359.yaml index 8f177e02ad35..04953f5b44a4 100644 --- a/Documentation/devicetree/bindings/sound/mt8195-mt6359-rt1019-rt5682.yaml +++ b/Documentation/devicetree/bindings/sound/mt8195-mt6359.yaml @@ -1,10 +1,10 @@ # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) %YAML 1.2 --- -$id: http://devicetree.org/schemas/sound/mt8195-mt6359-rt1019-rt5682.yaml# +$id: http://devicetree.org/schemas/sound/mt8195-mt6359.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: Mediatek MT8195 with MT6359, RT1019 and RT5682 ASoC sound card driver +title: MediaTek MT8195 ASoC sound card driver maintainers: - Trevor Wu <trevor.wu@mediatek.com> @@ -14,7 +14,9 @@ description: properties: compatible: - const: mediatek,mt8195_mt6359_rt1019_rt5682 + enum: + - mediatek,mt8195_mt6359_rt1019_rt5682 + - mediatek,mt8195_mt6359_rt1011_rt5682 model: $ref: /schemas/types.yaml#/definitions/string
Because the same binding components can be shared by all codecs combinations, we only reserve one binding file for mt8195 machine driver and rename to a generic name. We use compatible string to separate different codec combination instead of creating a new binding file for new codec combination. Signed-off-by: Trevor Wu <trevor.wu@mediatek.com> --- .../sound/mt8195-mt6359-rt1011-rt5682.yaml | 51 ------------------- ...-rt1019-rt5682.yaml => mt8195-mt6359.yaml} | 8 +-- 2 files changed, 5 insertions(+), 54 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/mt8195-mt6359-rt1011-rt5682.yaml rename Documentation/devicetree/bindings/sound/{mt8195-mt6359-rt1019-rt5682.yaml => mt8195-mt6359.yaml} (87%)