From patchwork Tue Nov 17 01:33:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring (Arm)" X-Patchwork-Id: 11911135 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C119DC388F9 for ; Tue, 17 Nov 2020 01:35:47 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4C06524695 for ; Tue, 17 Nov 2020 01:35:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=alsa-project.org header.i=@alsa-project.org header.b="pzJEoQVX" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4C06524695 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 4D7C71781; Tue, 17 Nov 2020 02:34:54 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 4D7C71781 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1605576944; bh=tuJTjCr29azU1T3/wPMq7j0qP7iS8sllKRkfMC4mPXg=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=pzJEoQVXWcWyW+AVwBBzqqvI2Q2V8rVFeaV+JQZZBOKwxwQEzaxYaO+gitsO0qkpA Ud7kD4bNXAE1V2EgtdjzxLlLzCjtlTxpntQCi1IV85KGN65ogHsWg51A4dNg/29jGr RhC/74zaSAWeP6si/mDgVMtNIjF0bfqSlRqFbuoc= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id C07DEF8029B; Tue, 17 Nov 2020 02:34:03 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 6669EF8016E; Tue, 17 Nov 2020 02:34:02 +0100 (CET) Received: from mail-oi1-f195.google.com (mail-oi1-f195.google.com [209.85.167.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id DE8C1F800D8 for ; Tue, 17 Nov 2020 02:33:54 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz DE8C1F800D8 Received: by mail-oi1-f195.google.com with SMTP id m13so20938937oih.8 for ; Mon, 16 Nov 2020 17:33:54 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=spsmauWvc5A5SYudUomXMMzn+PeDbEjuioZTNAq65wc=; b=E9Kg8LpScepEpomNbePQZJay2lvHwuRMSwy/OuYHu5dWY+9m5n9PWu/lJqzYLHurwC bMoQKE1aXSuSFH9sTavM1S4WLeKmDBVB98A6hlPRkF3GDzqIK7TeeC52qtCQfkM+pODQ 8ZcqxYAlUrU2I+spUruXZ+KcG07FGbZ2blyliBQR3AsNsnHJKQ6Y/UxWqZrQv+Ridb4B wDsWH+TOTGWpUzmH8yE47f/XdBcTrYj9oVldKFLpHpbrlx5aiyyX8Exx8xuxHRA/TPMB xscy3JDFIolaSwZgKitKoasBDZ9GMiTtWC1fbToTLVVKGrqpi3htRGALHG0EWmvC0paR LqAQ== X-Gm-Message-State: AOAM531F1ZnRgTra/E9ZxKZM6QZ2hMcpst2D2ROcD7eQ0akR69mU8CuN v93v0gvovQdZqxwc3+URBw== X-Google-Smtp-Source: ABdhPJwAoktwKb9CWVlc2LS2AAtpaWZoLT4ef5gt28xJSOD8nEazcXh9uwt/ZK7/G6xwTypii9uUJA== X-Received: by 2002:aca:fcd5:: with SMTP id a204mr970460oii.161.1605576832729; Mon, 16 Nov 2020 17:33:52 -0800 (PST) Received: from xps15.herring.priv (24-155-109-49.dyn.grandenetworks.net. [24.155.109.49]) by smtp.googlemail.com with ESMTPSA id j9sm3861325oij.44.2020.11.16.17.33.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 17:33:52 -0800 (PST) From: Rob Herring To: Mark Brown Subject: [PATCH 2/4] ASoC: dt-bindings: Use OF graph schema Date: Mon, 16 Nov 2020 19:33:47 -0600 Message-Id: <20201117013349.2458416-3-robh@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201117013349.2458416-1-robh@kernel.org> References: <20201117013349.2458416-1-robh@kernel.org> MIME-Version: 1.0 Cc: devicetree@vger.kernel.org, alsa-devel@alsa-project.org, Kuninori Morimoto , Sameer Pujar , Liam Girdwood , Lubomir Rintel X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" Now that we have an OF graph schema, let's use it for the audio-graph-port schema. There's no need to define 'ports' nodes as specific bindings must define that and port numbering of the child 'port' nodes. Signed-off-by: Rob Herring --- Note that graph.yaml is part of dtschema now intead of the kernel tree. --- .../bindings/sound/audio-graph-port.yaml | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/audio-graph-port.yaml b/Documentation/devicetree/bindings/sound/audio-graph-port.yaml index 9db19d4edc6a..c05d5643b10e 100644 --- a/Documentation/devicetree/bindings/sound/audio-graph-port.yaml +++ b/Documentation/devicetree/bindings/sound/audio-graph-port.yaml @@ -13,11 +13,9 @@ select: false properties: port: - description: single OF-Graph subnode + $ref: /schemas/graph.yaml#/properties/port type: object properties: - reg: - maxItems: 1 prefix: description: "device name prefix" $ref: /schemas/types.yaml#/definitions/string @@ -31,8 +29,6 @@ properties: "^endpoint(@[0-9a-f]+)?": type: object properties: - remote-endpoint: - maxItems: 1 mclk-fs: description: | Multiplication factor between stream rate and codec mclk. @@ -73,14 +69,6 @@ properties: description: CPU to Codec rate channels. $ref: /schemas/types.yaml#/definitions/uint32 - required: - - remote-endpoint - - ports: - description: multi OF-Graph subnode - type: object - patternProperties: - "^port(@[0-9a-f]+)?": - $ref: "#/properties/port" + additionalProperties: false additionalProperties: true