From nobody Sun Sep 22 09:39:47 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 32191C433F5 for ; Wed, 16 Mar 2022 06:02:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353802AbiCPGDb (ORCPT ); Wed, 16 Mar 2022 02:03:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43790 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353731AbiCPGDL (ORCPT ); Wed, 16 Mar 2022 02:03:11 -0400 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 301A0606CB; Tue, 15 Mar 2022 23:01:57 -0700 (PDT) X-UUID: 01693fc781b64e3991c9f32d7ce8ed2d-20220316 X-UUID: 01693fc781b64e3991c9f32d7ce8ed2d-20220316 Received: from mtkmbs10n2.mediatek.inc [(172.21.101.183)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 1656271736; Wed, 16 Mar 2022 14:01:47 +0800 Received: from mtkexhb01.mediatek.inc (172.21.101.102) by mtkmbs10n2.mediatek.inc (172.21.101.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.792.3; Wed, 16 Mar 2022 14:01:46 +0800 Received: from mtkcas11.mediatek.inc (172.21.101.40) by mtkexhb01.mediatek.inc (172.21.101.102) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 16 Mar 2022 14:01:46 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas11.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Wed, 16 Mar 2022 14:01:46 +0800 From: Trevor Wu To: , , , CC: , , , , , , , , Subject: [PATCH v2 2/5] ASoC: dt-bindings: mediatek: mt8195: merge mt8195 machine yaml Date: Wed, 16 Mar 2022 14:01:36 +0800 Message-ID: <20220316060139.6211-3-trevor.wu@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20220316060139.6211-1-trevor.wu@mediatek.com> References: <20220316060139.6211-1-trevor.wu@mediatek.com> MIME-Version: 1.0 X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 --- .../sound/mt8195-mt6359-rt1011-rt5682.yaml | 51 ------------------- ...-rt1019-rt5682.yaml =3D> mt8195-mt6359.yaml} | 8 +-- 2 files changed, 5 insertions(+), 54 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/mt8195-mt6359-r= t1011-rt5682.yaml rename Documentation/devicetree/bindings/sound/{mt8195-mt6359-rt1019-rt568= 2.yaml =3D> mt8195-mt6359.yaml} (87%) diff --git a/Documentation/devicetree/bindings/sound/mt8195-mt6359-rt1011-r= t5682.yaml b/Documentation/devicetree/bindings/sound/mt8195-mt6359-rt1011-r= t5682.yaml deleted file mode 100644 index cf6ad7933e23..000000000000 --- a/Documentation/devicetree/bindings/sound/mt8195-mt6359-rt1011-rt5682.y= aml +++ /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 driv= er - -maintainers: - - Trevor Wu - -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 =3D "mediatek,mt8195_mt6359_rt1011_rt5682"; - mediatek,platform =3D <&afe>; - pinctrl-names =3D "default"; - pinctrl-0 =3D <&aud_pins_default>; - }; - -... diff --git a/Documentation/devicetree/bindings/sound/mt8195-mt6359-rt1019-r= t5682.yaml b/Documentation/devicetree/bindings/sound/mt8195-mt6359.yaml similarity index 87% rename from Documentation/devicetree/bindings/sound/mt8195-mt6359-rt1019-rt= 5682.yaml rename to Documentation/devicetree/bindings/sound/mt8195-mt6359.yaml index 8f177e02ad35..74227fba91c7 100644 --- a/Documentation/devicetree/bindings/sound/mt8195-mt6359-rt1019-rt5682.y= aml +++ 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# =20 -title: Mediatek MT8195 with MT6359, RT1019 and RT5682 ASoC sound card driv= er +title: Mediatek MT8195 ASoC sound card driver =20 maintainers: - Trevor Wu @@ -14,7 +14,9 @@ description: =20 properties: compatible: - const: mediatek,mt8195_mt6359_rt1019_rt5682 + enum: + - mediatek,mt8195_mt6359_rt1019_rt5682 + - mediatek,mt8195_mt6359_rt1011_rt5682 =20 model: $ref: /schemas/types.yaml#/definitions/string --=20 2.18.0