From mboxrd@z Thu Jan 1 00:00:00 1970 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 60CC9C47DD9 for ; Fri, 22 Mar 2024 13:58:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=vAlI3vo2kP1Rwylzk8CZOUFhHfcTh8/yf41lKIttKHE=; b=GrrQ80OfYYsYJV mzz1q23AXmS4OPMp2dm0IhsJk6ZtMVfJfsO/Hetsxxn7QtmWAMTDWZ9NcJtgblzcP/g+g//iXHe1E Q4MBq7rVQyShrwxt7mXDwQLlCGjE+kFwG/vxeWxiIbFAOlo6OCEF5+ImDuKdTtyIunVlfWC09vu1m hfUsfKRQQr2qg2++eBp4BADEHic9MDfKAY2xjogdqJlzvp/3sXLSU7B9/kL9MXfkXJBXCsm14eAe8 U3bU9QtwNkzpyTHkl4VZHgrPn4MFZ+zZcNYwhrwEhc/IixjNcylUgQcQIpZSOW0wrIv5WcNsd07OO eSPxnJO6uPcQ1HBv1Q5g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rnfPK-00000007Rqt-2Uvl; Fri, 22 Mar 2024 13:58:06 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rnfPH-00000007RqL-3aXB for linux-arm-kernel@lists.infradead.org; Fri, 22 Mar 2024 13:58:05 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 4017B6145E; Fri, 22 Mar 2024 13:58:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A2916C433C7; Fri, 22 Mar 2024 13:58:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711115882; bh=5nLcUidKgB5r+f5iPuyJSAw+a/z19rQjH3i+N+5NLRQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=mPCXHgW1IBzKaRUZPDWCykrnbXv43wXL7J6eM7RgiJ7FOAg+unkiSiXgkoNDZCR0s 1nWXtMW8Sgwlzry9/Vgn8jvX4HZ+fm3gYLfjXlKF5OA0BiTPZo9ik9Kw07HhYwnTUD czzmn0tBqc3otfzGUCqszU3mFmL5rzRrM+/cAcfipejrtLAtQ7rPsYepJGQawNlwOx s8B2+WkK7N+KpmDz9UYRKrqLP/vAJZLVzOdT2h1q2Vddh67n4V2yPMHvjF8GlpA5AY NDBsBzlgZSX5ShiwasgCNsp9Lasfue6Cn0bs6+XinuqqOUBXMqWIAhqybOzHMdeMYk WnpdAzFDKULyA== Date: Fri, 22 Mar 2024 08:58:00 -0500 From: Rob Herring To: Shengjiu Wang Cc: lgirdwood@gmail.com, broonie@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, shengjiu.wang@gmail.com, linux-sound@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH 1/2] ASoC: dt-bindings: fsl-asoc-card: convert to YAML Message-ID: <20240322135800.GA811908-robh@kernel.org> References: <1711102406-8399-1-git-send-email-shengjiu.wang@nxp.com> <1711102406-8399-2-git-send-email-shengjiu.wang@nxp.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1711102406-8399-2-git-send-email-shengjiu.wang@nxp.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240322_065804_017130_0FBCD90B X-CRM114-Status: GOOD ( 35.69 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, Mar 22, 2024 at 06:13:25PM +0800, Shengjiu Wang wrote: > Convert the fsl-asoc-card binding to YAML. > > In order to pass the checking, add some used compatible > string from devicetree. > > Signed-off-by: Shengjiu Wang > --- > .../bindings/sound/fsl-asoc-card.txt | 117 ----------- > .../bindings/sound/fsl-asoc-card.yaml | 196 ++++++++++++++++++ > 2 files changed, 196 insertions(+), 117 deletions(-) > delete mode 100644 Documentation/devicetree/bindings/sound/fsl-asoc-card.txt > create mode 100644 Documentation/devicetree/bindings/sound/fsl-asoc-card.yaml > > diff --git a/Documentation/devicetree/bindings/sound/fsl-asoc-card.txt b/Documentation/devicetree/bindings/sound/fsl-asoc-card.txt > deleted file mode 100644 > index 4e8dbc5abfd1..000000000000 > --- a/Documentation/devicetree/bindings/sound/fsl-asoc-card.txt > +++ /dev/null > @@ -1,117 +0,0 @@ > -Freescale Generic ASoC Sound Card with ASRC support > - > -The Freescale Generic ASoC Sound Card can be used, ideally, for all Freescale > -SoCs connecting with external CODECs. > - > -The idea of this generic sound card is a bit like ASoC Simple Card. However, > -for Freescale SoCs (especially those released in recent years), most of them > -have ASRC (Documentation/devicetree/bindings/sound/fsl,asrc.txt) inside. And > -this is a specific feature that might be painstakingly controlled and merged > -into the Simple Card. > - > -So having this generic sound card allows all Freescale SoC users to benefit > -from the simplification of a new card support and the capability of the wide > -sample rates support through ASRC. > - > -Note: The card is initially designed for those sound cards who use AC'97, I2S > - and PCM DAI formats. However, it'll be also possible to support those non > - AC'97/I2S/PCM type sound cards, such as S/PDIF audio and HDMI audio, as > - long as the driver has been properly upgraded. > - > - > -The compatible list for this generic sound card currently: > - "fsl,imx-audio-ac97" > - > - "fsl,imx-audio-cs42888" > - > - "fsl,imx-audio-cs427x" > - (compatible with CS4271 and CS4272) > - > - "fsl,imx-audio-wm8962" > - > - "fsl,imx-audio-sgtl5000" > - (compatible with Documentation/devicetree/bindings/sound/imx-audio-sgtl5000.txt) > - > - "fsl,imx-audio-wm8960" > - > - "fsl,imx-audio-mqs" > - > - "fsl,imx-audio-wm8524" > - > - "fsl,imx-audio-tlv320aic32x4" > - > - "fsl,imx-audio-tlv320aic31xx" > - > - "fsl,imx-audio-si476x" > - > - "fsl,imx-audio-wm8958" > - > - "fsl,imx-audio-nau8822" > - > -Required properties: > - > - - compatible : Contains one of entries in the compatible list. > - > - - model : The user-visible name of this sound complex > - > - - audio-cpu : The phandle of an CPU DAI controller > - > - - audio-codec : The phandle of an audio codec > - > -Optional properties: > - > - - audio-asrc : The phandle of ASRC. It can be absent if there's no > - need to add ASRC support via DPCM. > - > - - audio-routing : A list of the connections between audio components. > - Each entry is a pair of strings, the first being the > - connection's sink, the second being the connection's > - source. There're a few pre-designed board connectors: > - * Line Out Jack > - * Line In Jack > - * Headphone Jack > - * Mic Jack > - * Ext Spk > - * AMIC (stands for Analog Microphone Jack) > - * DMIC (stands for Digital Microphone Jack) > - > - Note: The "Mic Jack" and "AMIC" are redundant while > - coexisting in order to support the old bindings > - of wm8962 and sgtl5000. > - > - - hp-det-gpio : The GPIO that detect headphones are plugged in > - - mic-det-gpio : The GPIO that detect microphones are plugged in > - - bitclock-master : Indicates dai-link bit clock master; for details see simple-card.yaml. > - - frame-master : Indicates dai-link frame master; for details see simple-card.yaml. > - - dai-format : audio format, for details see simple-card.yaml. > - - frame-inversion : dai-link uses frame clock inversion, for details see simple-card.yaml. > - - bitclock-inversion : dai-link uses bit clock inversion, for details see simple-card.yaml. > - - mclk-id : main clock id, specific for each card configuration. > - > -Optional unless SSI is selected as a CPU DAI: > - > - - mux-int-port : The internal port of the i.MX audio muxer (AUDMUX) > - > - - mux-ext-port : The external port of the i.MX audio muxer > - > -Example: > -sound-cs42888 { > - compatible = "fsl,imx-audio-cs42888"; > - model = "cs42888-audio"; > - audio-cpu = <&esai>; > - audio-asrc = <&asrc>; > - audio-codec = <&cs42888>; > - audio-routing = > - "Line Out Jack", "AOUT1L", > - "Line Out Jack", "AOUT1R", > - "Line Out Jack", "AOUT2L", > - "Line Out Jack", "AOUT2R", > - "Line Out Jack", "AOUT3L", > - "Line Out Jack", "AOUT3R", > - "Line Out Jack", "AOUT4L", > - "Line Out Jack", "AOUT4R", > - "AIN1L", "Line In Jack", > - "AIN1R", "Line In Jack", > - "AIN2L", "Line In Jack", > - "AIN2R", "Line In Jack"; > -}; > diff --git a/Documentation/devicetree/bindings/sound/fsl-asoc-card.yaml b/Documentation/devicetree/bindings/sound/fsl-asoc-card.yaml > new file mode 100644 > index 000000000000..48051655230d > --- /dev/null > +++ b/Documentation/devicetree/bindings/sound/fsl-asoc-card.yaml > @@ -0,0 +1,196 @@ > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/sound/fsl-asoc-card.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Freescale Generic ASoC Sound Card with ASRC support > + > +description: > + The Freescale Generic ASoC Sound Card can be used, ideally, > + for all Freescale SoCs connecting with external CODECs. > + > + The idea of this generic sound card is a bit like ASoC Simple Card. > + However, for Freescale SoCs (especially those released in recent years), > + most of them have ASRC > + (Documentation/devicetree/bindings/sound/fsl,imx-asrc.yaml) inside. And > + this is a specific feature that might be painstakingly controlled and > + merged into the Simple Card. > + > + So having this generic sound card allows all Freescale SoC users to > + benefit from the simplification of a new card support and the capability > + of the wide sample rates support through ASRC. > + > + Note, The card is initially designed for those sound cards who use AC'97, I2S > + and PCM DAI formats. However, it'll be also possible to support those non > + AC'97/I2S/PCM type sound cards, such as S/PDIF audio and HDMI audio, as > + long as the driver has been properly upgraded. > + > +maintainers: > + - Shengjiu Wang > + > +properties: > + compatible: > + oneOf: > + - items: > + - enum: > + - fsl,imx-sgtl5000 > + - fsl,imx53-cpuvo-sgtl5000 > + - fsl,imx51-babbage-sgtl5000 > + - fsl,imx53-m53evk-sgtl5000 > + - fsl,imx53-qsb-sgtl5000 > + - fsl,imx53-voipac-sgtl5000 > + - fsl,imx6-armadeus-sgtl5000 > + - fsl,imx6-rex-sgtl5000 > + - fsl,imx6-sabreauto-cs42888 > + - fsl,imx6-wandboard-sgtl5000 > + - fsl,imx6dl-nit6xlite-sgtl5000 > + - fsl,imx6q-ba16-sgtl5000 > + - fsl,imx6q-nitrogen6_max-sgtl5000 > + - fsl,imx6q-nitrogen6_som2-sgtl5000 > + - fsl,imx6q-nitrogen6x-sgtl5000 > + - fsl,imx6q-sabrelite-sgtl5000 > + - fsl,imx6q-sabresd-wm8962 > + - fsl,imx6q-udoo-ac97 > + - fsl,imx6q-ventana-sgtl5000 > + - fsl,imx6sl-evk-wm8962 > + - fsl,imx6sx-sdb-mqs > + - fsl,imx6sx-sdb-wm8962 > + - fsl,imx7d-evk-wm8960 > + - karo,tx53-audio-sgtl5000 > + - tq,imx53-mba53-sgtl5000 None of these were documented before. It's fine to add all these in this patch, but please state in the commit message what missing or incorrect things you added in the schema. > + - enum: > + - fsl,imx-audio-ac97 > + - fsl,imx-audio-cs42888 > + - fsl,imx-audio-mqs > + - fsl,imx-audio-sgtl5000 > + - fsl,imx-audio-wm8960 > + - fsl,imx-audio-wm8962 > + - items: > + - enum: > + - fsl,imx-audio-ac97 > + - fsl,imx-audio-cs42888 > + - fsl,imx-audio-cs427x > + - fsl,imx-audio-mqs > + - fsl,imx-audio-nau8822 > + - fsl,imx-audio-sgtl5000 > + - fsl,imx-audio-si476x > + - fsl,imx-audio-tlv320aic31xx > + - fsl,imx-audio-tlv320aic32x4 > + - fsl,imx-audio-wm8524 > + - fsl,imx-audio-wm8960 > + - fsl,imx-audio-wm8962 > + - fsl,imx-audio-wm8958 > + > + model: > + $ref: /schemas/types.yaml#/definitions/string > + description: The user-visible name of this sound complex > + > + audio-asrc: > + $ref: /schemas/types.yaml#/definitions/phandle > + description: > + The phandle of ASRC. It can be absent if there's no > + need to add ASRC support via DPCM. > + > + audio-codec: > + $ref: /schemas/types.yaml#/definitions/phandle > + description: The phandle of an audio codec > + > + audio-cpu: > + $ref: /schemas/types.yaml#/definitions/phandle > + description: The phandle of an CPU DAI controller > + > + audio-routing: > + $ref: /schemas/types.yaml#/definitions/non-unique-string-array > + description: > + A list of the connections between audio components. Each entry is a > + pair of strings, the first being the connection's sink, the second > + being the connection's source. There're a few pre-designed board > + connectors. > + * Line Out Jack > + * Line In Jack > + * Headphone Jack > + * Mic Jack > + * Ext Spk > + * AMIC (stands for Analog Microphone Jack) > + * DMIC (stands for Digital Microphone Jack) > + Note, The "Mic Jack" and "AMIC" are redundant while coexisting in > + order to support the old bindings of wm8962 and sgtl5000. Please list the strings out as schema: minItems: 2 items: enum: - "Line Out Jack" ... > + > + hp-det-gpio: > + maxItems: 1 > + description: The GPIO that detect headphones are plugged in deprecated: true > + > + hp-det-gpios: > + maxItems: 1 > + description: The GPIO that detect headphones are plugged in > + > + mic-det-gpio: > + maxItems: 1 > + description: The GPIO that detect microphones are plugged in deprecated: true > + > + mic-det-gpios: > + maxItems: 1 > + description: The GPIO that detect microphones are plugged in > + > + bitclock-master: > + description: Indicates dai-link bit clock master; for details see simple-card.yaml. Drop the prose reference and add: $ref: simple-card.yaml#/definitions/bitclock-master Otherwise, bitclock-master could be anything. And similar for the rest. > + > + frame-master: > + description: Indicates dai-link frame master; for details see simple-card.yaml. > + > + dai-format: > + description: audio format, for details see simple-card.yaml. > + > + frame-inversion: > + description: dai-link uses frame clock inversion, for details see simple-card.yaml. > + > + bitclock-inversion: > + description: dai-link uses bit clock inversion, for details see simple-card.yaml. > + > + mclk-id: > + $ref: /schemas/types.yaml#/definitions/uint32 > + description: main clock id, specific for each card configuration. > + > + mux-int-port: > + $ref: /schemas/types.yaml#/definitions/uint32 > + enum: [1, 2, 7] > + description: The internal port of the i.MX audio muxer (AUDMUX) > + > + mux-ext-port: > + $ref: /schemas/types.yaml#/definitions/uint32 > + enum: [3, 4, 5, 6] > + description: The external port of the i.MX audio muxer > + > + ssi-controller: > + $ref: /schemas/types.yaml#/definitions/phandle > + description: The phandle of an CPU DAI controller > + > +required: > + - compatible > + - model > + > +unevaluatedProperties: false > + > +examples: > + - | > + sound-cs42888 { > + compatible = "fsl,imx-audio-cs42888"; > + model = "cs42888-audio"; > + audio-cpu = <&esai>; > + audio-asrc = <&asrc>; > + audio-codec = <&cs42888>; > + audio-routing = > + "Line Out Jack", "AOUT1L", > + "Line Out Jack", "AOUT1R", > + "Line Out Jack", "AOUT2L", > + "Line Out Jack", "AOUT2R", > + "Line Out Jack", "AOUT3L", > + "Line Out Jack", "AOUT3R", > + "Line Out Jack", "AOUT4L", > + "Line Out Jack", "AOUT4R", > + "AIN1L", "Line In Jack", > + "AIN1R", "Line In Jack", > + "AIN2L", "Line In Jack", > + "AIN2R", "Line In Jack"; > + }; > -- > 2.34.1 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel