From patchwork Mon Jan 9 08:33:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 40699 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp2041855wrt; Mon, 9 Jan 2023 00:40:36 -0800 (PST) X-Google-Smtp-Source: AMrXdXvOM3GxlsLcXC6o+hWn1RDlpxDXXGSMkgBcRYB9yenX16VadrWSpzztaiAKGvmnWJ5L9kNU X-Received: by 2002:a17:902:70cb:b0:189:cada:4294 with SMTP id l11-20020a17090270cb00b00189cada4294mr61124239plt.5.1673253635717; Mon, 09 Jan 2023 00:40:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673253635; cv=none; d=google.com; s=arc-20160816; b=NKC53XBti6F9XSeJM9ito6CvvS4t9xT0uOgsmn4c7KdOGJp4dV7g0MKkEnki/O1hkE LSaya3KP279J+b/ytI9Zkxq5ByebFIl+wHCl8YRBXPRs7GLwvGFJSypBUQlDzhA+6Ovu 9O9Td9D82AURozEmbnETDMlXwS/RuWVBjNdP1vf1+0I5IXf6Qfuwm8Wjmn9aO3KslSoI KN23dKMs5hVxbfemxQAyqrAUnY7wz6FVEFwO8ZEKN/vnEE68HXGRjMu85k9WTi+j+wKW JRdLeMLrMKr599MMPH/1JOxjUBMnQaB+LOr1h2ZUMumaVtIarZyCbKc021ySxg8RVKqw eDcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=kDytp4ppEMXSrwGkxdHQ2/Mw1kec/DZDS/Y2CvEOddk=; b=rqJgL8NPisUOTQQvluGaPExhOcALQYQRh6DWJESbt5LBImRgKzYWbsZ3rDChtCl3Jz vLPlm4eb0y2uMT9r0g7eVUjK881ZdNfB052UqIim06MFsIb3tUZWch0lAnFz+9XhL9Jn W/txNSx2ThPzdSIgDBm+2XSHkdMJ24Z/Itjkhg3elx2Xtx9S3HxEL0VsZYAD/Q+jf7tk n3FAxUI/z0LosTUHg7vy86CFRNwb+6pjozhC2ToDQUx+04g8MKcse4d7P/+UEBRcauqN jafDbXCD7UthGsReTKLto/BLZ51n1+BxhyjJWSd54r0EWxfuehqiIDcmZFCiEVSYHr07 CXsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fpkQU3VD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t70-20020a638149000000b004ad28ffca47si7462209pgd.572.2023.01.09.00.40.23; Mon, 09 Jan 2023 00:40:35 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fpkQU3VD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233876AbjAIIdR (ORCPT + 99 others); Mon, 9 Jan 2023 03:33:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45660 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233624AbjAIIdI (ORCPT ); Mon, 9 Jan 2023 03:33:08 -0500 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0DB6F637B for ; Mon, 9 Jan 2023 00:33:07 -0800 (PST) Received: by mail-wm1-x32b.google.com with SMTP id ja17so5682553wmb.3 for ; Mon, 09 Jan 2023 00:33:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=kDytp4ppEMXSrwGkxdHQ2/Mw1kec/DZDS/Y2CvEOddk=; b=fpkQU3VDvUACOj+YNaC9ZvbLMA+CAtC9Tvdv8hxMA4sNEcnjNRoBkA7F3xE6gbn2vM k6sQLcmL4g4o6cWK0qvxUc0h77czTT/3swoeaLSf2HitylMjS1J07hUlwLywdTjbcZu5 TiwVxKZfBbgPPb8e1B6vbM+WBIm0BKoXrndfrXkmHz4kAZruAmgUbUy/WyJB0qIaJASr 9dP9YbKO+tsWV6j4t2RS/XsLzRJWI2wZRz5OXs8ncm8CuZ4KumOynT7DmVN5Bq5N7xpx bT/syfsvZu3JHh9bhMwoCKY09uMFG5SfdLDAIC7r7uD1fR6nxpFw+x4cDxcg0HhU196k 2TMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=kDytp4ppEMXSrwGkxdHQ2/Mw1kec/DZDS/Y2CvEOddk=; b=7pNzu5EU92S/yobIVQt4Jv/V7Kjnqe+aPgNYMzLqKtPV1aI2U40tuOpv6h9W/qdykm wV0IppO3NG2yQdmBqkakf8xpm+B80PrEkSD0so+sc1jFaVdNhTRhjOAhChYHJWHhBgVk 1U1IppZfqAL/gfxlTsExOl6uV+MUDy0nA/9RFR24QST+ma5DoesZeDDfQaRcnXxKPJfF uaWsrquy8gcU//50CC3v/C5nsxWQHEpNGzJ/U3rdRURBef/qGty1I+3+tpf+HTFpW6M2 gNoNMYGTSl1m0FsfUE2HjsXPIEDAYtV46w21KyNmfgW9pDiOzDKbVOoll6+V0bze/n3/ 2g0w== X-Gm-Message-State: AFqh2kooX9AmlYdK1ZOpFBX5ZH1Dn1uGYVj2qdwk826IEl+GluDSXDj8 NFWdrjJUjmMRhR7TA6jrHRMMww== X-Received: by 2002:a05:600c:4998:b0:3cf:68d3:3047 with SMTP id h24-20020a05600c499800b003cf68d33047mr44934987wmp.41.1673253185638; Mon, 09 Jan 2023 00:33:05 -0800 (PST) Received: from krzk-bin.. ([178.197.216.144]) by smtp.gmail.com with ESMTPSA id f28-20020a05600c491c00b003d9bd56e9c1sm10031744wmp.11.2023.01.09.00.33.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Jan 2023 00:33:05 -0800 (PST) From: Krzysztof Kozlowski To: Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Kuninori Morimoto , alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH] ASoC: dt-bindings: simple-card: correct DAI subnodes pattern Date: Mon, 9 Jan 2023 09:33:01 +0100 Message-Id: <20230109083301.76282-1-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754533604519029415?= X-GMAIL-MSGID: =?utf-8?q?1754533604519029415?= The simple-audio-card,dai-link node does not allow address/size-cells thus children (cpu, codec) should come without unit addresses. For cases with multiple nodes of same type, require a dash before index (e.g. cpu-x) and add trailing $ to the pattern to disallow other characters. Signed-off-by: Krzysztof Kozlowski --- .../devicetree/bindings/sound/simple-card.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/simple-card.yaml b/Documentation/devicetree/bindings/sound/simple-card.yaml index ed19899bc94b..08743741b09e 100644 --- a/Documentation/devicetree/bindings/sound/simple-card.yaml +++ b/Documentation/devicetree/bindings/sound/simple-card.yaml @@ -244,9 +244,9 @@ patternProperties: maxItems: 1 patternProperties: - "^cpu(@[0-9a-f]+)?": + "^cpu(-[0-9]+)?$": $ref: "#/definitions/dai" - "^codec(@[0-9a-f]+)?": + "^codec(-[0-9]+)?$": $ref: "#/definitions/dai" additionalProperties: false @@ -462,16 +462,16 @@ examples: convert-channels = <8>; /* TDM Split */ - sndcpu1: cpu0 { + sndcpu1: cpu-0 { sound-dai = <&rcar_sound 1>; }; - cpu1 { + cpu-1 { sound-dai = <&rcar_sound 2>; }; - cpu2 { + cpu-2 { sound-dai = <&rcar_sound 3>; }; - cpu3 { + cpu-3 { sound-dai = <&rcar_sound 4>; }; codec {