From patchwork Sun Dec 25 11:59:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 36470 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp492336wrt; Sun, 25 Dec 2022 04:00:39 -0800 (PST) X-Google-Smtp-Source: AMrXdXvd5dubKOT32yQfdXQrNYzljtL+xBvpbvFLIXjhfPOW9Yihi0ToA31BGuaYMMsNY/z5tuFo X-Received: by 2002:a05:6a21:99a4:b0:a3:94cd:1435 with SMTP id ve36-20020a056a2199a400b000a394cd1435mr25238846pzb.38.1671969639568; Sun, 25 Dec 2022 04:00:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671969639; cv=none; d=google.com; s=arc-20160816; b=hiIdyjGfFLvEWaxzkFwAvKs6wYKDPeBdiOJgNWx0OpdVgP2vbmvBpwTqTDI+4t21lQ S1rX1sA8MldnK+pDpjdoV+7XvV/p8SoRgAwgqWf0MtOPVSVKedB4xiqoo9qw/D/31H1q o1aT7RR42qXGvyKfuGGanOxjY551D1dQbVgoUK42nuMLD+T/Ae1CeU1z/bvLp0mMAyOe RtQCZL8eIxEoZ+GBaCfPesBiDvG+ZfqaQNm5diWpWc17BmYPu1dt8zCgHM70BreTEvlz dwAu2egXZozdClG5nkRwBDx+MH50dgpdZNbJef1jQK2umtTari/z3Z46PDnlPUB+weDM sjxg== 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=dA76ZhQFpBF+Sh976k45P5Ks3Bs+iIujWGcFzhlrvu0=; b=qatyQhaKqdpDAmjHnTuNGI72qqG92fkSXDOKifFlpk+g0eZJ1vDwcjIoYGyVtZZuFh 6y6CltFvMxqXvJxxtvw0xKIm1cJzTU/ywgir9cx0akejejnoxWNvJmFJqFpczVXyLJor 3+Nt8+7hRybLfFFxQ8sTCAWLSybjIejIJwgurgKhPar20OHbEwZQP/ss9pU80h5on1nD foKZSWScmcNSiNr0dehFjfJ0nJOfWZYu7Dt5OqHV9mNOARgqqh7sNSaw8Fyi6honW5Ic CEkn0Bhlg3lAeq7hVQjhTj/1P5gGOGNoMmhkS6PrPNIk6W3leqzi38QaHnuYlvkqzQq1 0/+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gsRhIZfJ; 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 u184-20020a6385c1000000b00476e98ca7d5si9150197pgd.785.2022.12.25.04.00.27; Sun, 25 Dec 2022 04:00:39 -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=gsRhIZfJ; 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 S231210AbiLYMAC (ORCPT + 99 others); Sun, 25 Dec 2022 07:00:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49610 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231147AbiLYL7e (ORCPT ); Sun, 25 Dec 2022 06:59:34 -0500 Received: from mail-lf1-x129.google.com (mail-lf1-x129.google.com [IPv6:2a00:1450:4864:20::129]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4849F64FF for ; Sun, 25 Dec 2022 03:59:11 -0800 (PST) Received: by mail-lf1-x129.google.com with SMTP id bf43so12884892lfb.6 for ; Sun, 25 Dec 2022 03:59:11 -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=dA76ZhQFpBF+Sh976k45P5Ks3Bs+iIujWGcFzhlrvu0=; b=gsRhIZfJOZ1yhDCZokfMQ5KC6x5w1k39WElrELyw1+agocW5EW1BxZEF6Rp8Lb38lI IKqxzq6WUUG1ayCdNNC9JHTvwrRfgz4ILtQUz0c6VmERYHhl1t8zvryK+CS2eW9rLbAA W9FQNOk7kgJMYC5WgzR1VpKX2bUC9MESY9NyBiRwdPGVst93WFFefCbxFqlOt5/u8Crh Yti+8HF9Vlow1PXqj577bcap3gnfIiQtJvAlz+7VGGBg3nibmsJrxN0YyNPvHKXLkIUI o6lrScgcgGIpH5r97CUTSROabxG1lED+ypvaJbioTKmcg5Rmvvbw6YEDsdZzsAaKzae/ bt/g== 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=dA76ZhQFpBF+Sh976k45P5Ks3Bs+iIujWGcFzhlrvu0=; b=GnsOdHLaiQaSjEC4FP2xAMydU/7i+adbKicV+jbPy1ab4+NlpZG7kZ7QNO2+RlzMBB iCdPbJ7fK9zdr5LyLLYzSDjC09L2+Sn7Nbdp+5fBKbvxLiDd094Ud/3aw4Vk+jIwE9By zViZlfQ6tS9GpUR0DJVWoW6ey0ULF/sqMg0wPa1jj1VAy3gC/XZjmLRb5s9lSRdBf1FX 8/3ixD5Qwr8HLvktyDeX5LlZN98CoNQ2HMavvl71hZakyKiFcGs/wHu4cS624ostf8fK Z80n2fmqkMsISz7SOevj5N8ECvLlCyujgJMfGGeMOaXMiDirxxNHr9uOmNSR9eaVPtP9 9f2g== X-Gm-Message-State: AFqh2krciFsaivEmvIVHfBF16ygEYv1JUjCMLHI1x/36dsrbzWaa7UpZ E1ti1sag/TdpamFWN7W/5OUNmw== X-Received: by 2002:ac2:43da:0:b0:4b6:ee14:3e98 with SMTP id u26-20020ac243da000000b004b6ee143e98mr4920842lfl.23.1671969550875; Sun, 25 Dec 2022 03:59:10 -0800 (PST) Received: from krzk-bin.NAT.warszawa.vectranet.pl (088156142067.dynamic-2-waw-k-3-2-0.vectranet.pl. [88.156.142.67]) by smtp.gmail.com with ESMTPSA id b17-20020ac25e91000000b004cb061887b5sm128819lfq.126.2022.12.25.03.59.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Dec 2022 03:59:10 -0800 (PST) From: Krzysztof Kozlowski To: Srinivas Kandagatla , Banajit Goswami , Andy Gross , Bjorn Andersson , Konrad Dybcio , Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , alsa-devel@alsa-project.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 1/2] ASoC: dt-bindings: qcom,lpass-wsa-macro: correct clocks on SM8250 Date: Sun, 25 Dec 2022 12:59:06 +0100 Message-Id: <20221225115907.55250-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?1753187236717753693?= X-GMAIL-MSGID: =?utf-8?q?1753187236717753693?= SM8250 DTS uses additional "va" clock in WSA macro device node: sm8250-sony-xperia-edo-pdx203.dtb: codec@3240000: clock-names: ['mclk', 'npl', 'macro', 'dcodec', 'va', 'fsgen'] is too long Signed-off-by: Krzysztof Kozlowski Acked-by: Rob Herring --- .../bindings/sound/qcom,lpass-wsa-macro.yaml | 58 +++++++++++++++---- 1 file changed, 47 insertions(+), 11 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/qcom,lpass-wsa-macro.yaml b/Documentation/devicetree/bindings/sound/qcom,lpass-wsa-macro.yaml index 2bf8d082f8f1..66cbb1f5e31a 100644 --- a/Documentation/devicetree/bindings/sound/qcom,lpass-wsa-macro.yaml +++ b/Documentation/devicetree/bindings/sound/qcom,lpass-wsa-macro.yaml @@ -9,9 +9,6 @@ title: LPASS(Low Power Audio Subsystem) VA Macro audio codec maintainers: - Srinivas Kandagatla -allOf: - - $ref: dai-common.yaml# - properties: compatible: enum: @@ -30,15 +27,12 @@ properties: const: 0 clocks: - maxItems: 5 + minItems: 5 + maxItems: 6 clock-names: - items: - - const: mclk - - const: npl - - const: macro - - const: dcodec - - const: fsgen + minItems: 5 + maxItems: 6 clock-output-names: maxItems: 1 @@ -55,10 +49,51 @@ required: - reg - "#sound-dai-cells" +allOf: + - $ref: dai-common.yaml# + + - if: + properties: + compatible: + enum: + - qcom,sc7280-lpass-wsa-macro + - qcom,sm8450-lpass-wsa-macro + - qcom,sc8280xp-lpass-wsa-macro + then: + properties: + clocks: + maxItems: 5 + clock-names: + items: + - const: mclk + - const: npl + - const: macro + - const: dcodec + - const: fsgen + + - if: + properties: + compatible: + enum: + - qcom,sm8250-lpass-wsa-macro + then: + properties: + clocks: + minItems: 6 + clock-names: + items: + - const: mclk + - const: npl + - const: macro + - const: dcodec + - const: va + - const: fsgen + unevaluatedProperties: false examples: - | + #include #include codec@3240000 { compatible = "qcom,sm8250-lpass-wsa-macro"; @@ -69,7 +104,8 @@ examples: <&audiocc 0>, <&q6afecc LPASS_HW_MACRO_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>, <&q6afecc LPASS_HW_DCODEC_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>, + <&aoncc LPASS_CDC_VA_MCLK>, <&vamacro>; - clock-names = "mclk", "npl", "macro", "dcodec", "fsgen"; + clock-names = "mclk", "npl", "macro", "dcodec", "va", "fsgen"; clock-output-names = "mclk"; };