From patchwork Mon Jan 24 17:03:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 534635 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 448AAC433EF for ; Mon, 24 Jan 2022 17:06:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241386AbiAXRG3 (ORCPT ); Mon, 24 Jan 2022 12:06:29 -0500 Received: from smtp-relay-internal-0.canonical.com ([185.125.188.122]:56968 "EHLO smtp-relay-internal-0.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244121AbiAXREa (ORCPT ); Mon, 24 Jan 2022 12:04:30 -0500 Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 5F7814004C for ; Mon, 24 Jan 2022 17:04:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1643043869; bh=tXqK0pipG2DbLRjVtcGxzSWNM2TWL5POjuuSkj4vEW8=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=cJpOrBPoyMpgaIMBUKgrGNMt6w3UvvSimrkwVFwIZZv48KB+GjVukAVJalXBCnr2o UCmNB5aIIykOtRAYDEEt3Ho7ydfh3BkuVuTEsn7nFHAxWXTCN9DBTjnmAiyc355/Fd TybYjyGOmVFoK8LCdn3Jlsj85u353eBd2xG/fSnA9AWNZHiyDUjmz8PvrHT/jvso2F 4L9YLlxPKJQMT1hJ5TA+mCdifEKey8wN5K+d3fn0fTvmZ1UkKjwf1y+lHrw1R8NSUo m2MXia/UOVhnADuGw//yRgcTkGI1Gxwu6JCW3Aa9NyHFl7P7c52HC5UGIxfZMOeupt yar7SgJ2jyKzg== Received: by mail-ed1-f69.google.com with SMTP id j1-20020aa7c341000000b0040417b84efeso13371202edr.21 for ; Mon, 24 Jan 2022 09:04:29 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tXqK0pipG2DbLRjVtcGxzSWNM2TWL5POjuuSkj4vEW8=; b=EA5InsDLuPuskW+t98qkrjWrv4MQF4UbysfSILoZ9bPGsG9Rp/EEVZPhnuWMWSAc2U FbZdhA/AIUbEZahea4hk1Ds1HVEhwdKtsZstzNLq1ZU85lsBJf81Mjq07ZooG5dd1hxW Mo+b9BbeN9UpquEwHhjDohnfkeZmyPphgbU+0n+64YY1DJsG0xua+hMIKQqkWWs2ZgWV zf4Lt8OVZZ82Z1w2aGKoZJiDErp/X12gBaJHaqWqN9cmPZx4WTKREss4fTwsrIVYdYBY x0XCA7/FQa8UVyINheE1C2baobDicF+Fqs/xvGhFjM1tU/vH48FJpehEMv3JIoBJyjww 0zEQ== X-Gm-Message-State: AOAM532elGX65rxSABp/8nHWoXYNiAqOyLjGZ9WIPzpydKPzgIIbDuYw zHijmUjQ3pQKljuwR+Il6/NJwe/ssM5J18g14XUS+EhOzt1Z/xYA127ikJM7k2gW00SdCpX0fI7 z+hO+5L4pMBqaCVwdkXfDBsFXwvKXkYv8QOT7idk= X-Received: by 2002:a17:907:62a1:: with SMTP id nd33mr13076920ejc.578.1643043867799; Mon, 24 Jan 2022 09:04:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJzXf92USALcbrXLrv5+/4JqlVrxe0UnW/ZBZv+jrm84Km565mZiaUpixrWAnqJJLbn1fOdrOw== X-Received: by 2002:a17:907:62a1:: with SMTP id nd33mr13076897ejc.578.1643043867500; Mon, 24 Jan 2022 09:04:27 -0800 (PST) Received: from localhost.localdomain (xdsl-188-155-168-84.adslplus.ch. [188.155.168.84]) by smtp.gmail.com with ESMTPSA id o11sm6903846edh.75.2022.01.24.09.04.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jan 2022 09:04:26 -0800 (PST) From: Krzysztof Kozlowski To: Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Sylwester Nawrocki , Jonathan Bakker , alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 6/6] ASoC: dt-bindings: samsung,tm2: convert to dtschema Date: Mon, 24 Jan 2022 18:03:36 +0100 Message-Id: <20220124170336.164320-6-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220124170336.164320-1-krzysztof.kozlowski@canonical.com> References: <20220124170336.164320-1-krzysztof.kozlowski@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Convert the audio complex on Samsung TM2 boards with Samsung Exynos SoC to DT schema format. Signed-off-by: Krzysztof Kozlowski --- .../bindings/sound/samsung,tm2-audio.txt | 42 ---------- .../bindings/sound/samsung,tm2.yaml | 80 +++++++++++++++++++ 2 files changed, 80 insertions(+), 42 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/samsung,tm2-audio.txt create mode 100644 Documentation/devicetree/bindings/sound/samsung,tm2.yaml diff --git a/Documentation/devicetree/bindings/sound/samsung,tm2-audio.txt b/Documentation/devicetree/bindings/sound/samsung,tm2-audio.txt deleted file mode 100644 index f5ccc12ddc00..000000000000 --- a/Documentation/devicetree/bindings/sound/samsung,tm2-audio.txt +++ /dev/null @@ -1,42 +0,0 @@ -Samsung Exynos5433 TM2(E) audio complex with WM5110 codec - -Required properties: - - - compatible : "samsung,tm2-audio" - - model : the user-visible name of this sound complex - - audio-codec : the first entry should be phandle of the wm5110 audio - codec node, as described in ../mfd/arizona.txt; - the second entry should be phandle of the HDMI - transmitter node - - i2s-controller : the list of phandle and argument tuples pointing to - I2S controllers, the first entry should be I2S0 and - the second one I2S1 - - audio-amplifier : the phandle of the MAX98504 amplifier - - samsung,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; valid names for sources and sinks are the - WM5110's and MAX98504's pins and the jacks on the - board: HP, SPK, Main Mic, Sub Mic, Third Mic, - Headset Mic - - mic-bias-gpios : GPIO pin that enables the Main Mic bias regulator - - -Example: - -sound { - compatible = "samsung,tm2-audio"; - audio-codec = <&wm5110>, <&hdmi>; - i2s-controller = <&i2s0 0>, <&i2s1 0>; - audio-amplifier = <&max98504>; - mic-bias-gpios = <&gpr3 2 0>; - model = "wm5110"; - samsung,audio-routing = - "HP", "HPOUT1L", - "HP", "HPOUT1R", - "SPK", "SPKOUT", - "SPKOUT", "HPOUT2L", - "SPKOUT", "HPOUT2R", - "Main Mic", "MICBIAS2", - "IN1R", "Main Mic"; -}; diff --git a/Documentation/devicetree/bindings/sound/samsung,tm2.yaml b/Documentation/devicetree/bindings/sound/samsung,tm2.yaml new file mode 100644 index 000000000000..74712d6f3ef4 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/samsung,tm2.yaml @@ -0,0 +1,80 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/samsung,tm2.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Samsung Exynos5433 TM2(E) audio complex with WM5110 codec + +maintainers: + - Krzysztof Kozlowski + - Sylwester Nawrocki + +properties: + compatible: + const: samsung,tm2-audio + + audio-amplifier: + description: Phandle to the MAX98504 amplifier. + $ref: /schemas/types.yaml#/definitions/phandle + + audio-codec: + description: Phandles to the codecs. + $ref: /schemas/types.yaml#/definitions/phandle-array + items: + - description: Phandle to the WM5110 audio codec. + - description: Phandle to the HDMI transmitter node. + + samsung,audio-routing: + description: | + 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; valid names for sources and sinks are the + WM5110's and MAX98504's pins and the jacks on the board: HP, SPK, Main + Mic, Sub Mic, Third Mic, Headset Mic. + $ref: /schemas/types.yaml#/definitions/non-unique-string-array + + i2s-controller: + description: Phandles to the I2S controllers. + $ref: /schemas/types.yaml#/definitions/phandle-array + items: + - description: Phandle to I2S0. + - description: Phandle to I2S1. + + mic-bias-gpios: + description: GPIO pin that enables the Main Mic bias regulator. + + model: + description: The user-visible name of this sound complex. + $ref: /schemas/types.yaml#/definitions/string + +required: + - compatible + - audio-amplifier + - audio-codec + - samsung,audio-routing + - i2s-controller + - mic-bias-gpios + - model + +additionalProperties: false + +examples: + - | + #include + + sound { + compatible = "samsung,tm2-audio"; + audio-codec = <&wm5110>, <&hdmi>; + i2s-controller = <&i2s0 0>, <&i2s1 0>; + audio-amplifier = <&max98504>; + mic-bias-gpios = <&gpr3 2 GPIO_ACTIVE_HIGH>; + model = "wm5110"; + samsung,audio-routing = "HP", "HPOUT1L", + "HP", "HPOUT1R", + "SPK", "SPKOUT", + "SPKOUT", "HPOUT2L", + "SPKOUT", "HPOUT2R", + "RCV", "HPOUT3L", + "RCV", "HPOUT3R"; + };