From patchwork Sat Sep 10 09:14:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 604650 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 464B7C6FA89 for ; Sat, 10 Sep 2022 09:14:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229656AbiIJJOo (ORCPT ); Sat, 10 Sep 2022 05:14:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44730 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229459AbiIJJOl (ORCPT ); Sat, 10 Sep 2022 05:14:41 -0400 Received: from mail-lj1-x234.google.com (mail-lj1-x234.google.com [IPv6:2a00:1450:4864:20::234]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C68E5167F2 for ; Sat, 10 Sep 2022 02:14:39 -0700 (PDT) Received: by mail-lj1-x234.google.com with SMTP id p5so4729415ljc.13 for ; Sat, 10 Sep 2022 02:14:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=I+Cj5rW1qPBHDkQI4vuAbqESvVL5430WmrKXOMhCHDY=; b=O/Ch6b7hOL+11g7GHWsi9eQQ87OhE38Owe7J26Hf+qJkjI3uMtsWTfnUXWG6dFbfKt k9xKNOAejKT4g8aQGXiP2avBx45e6M1pDb/M/+WRVhA5STyn3cjPO1eX08qdvF5FUQna lW4TqOuxtZ/0qhjvdXDH52uLoeiv5bPfVOXCJBzTCGffJAdVv6098cbSaxRRs4c2tvRn CT4tghY+gpBpHKP9LAdl96Xava53XZloZNsvT8gg+Hw+4w4XxvoEf9yP5XiKIPjLqEex 1amt3ChYBfnZDM1vPiCz9nCTkMYC03tCnQvD9X9FxLHNuEk29c3svj40W7YbTcQenb7N TLNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=I+Cj5rW1qPBHDkQI4vuAbqESvVL5430WmrKXOMhCHDY=; b=xHGSkopBsAITAo4h4Iu/HXcaPrB6LqvWGBWYqj2BOTwJegAl1egDT/s9vfnic1ekx3 OmrfzSMv8nWVu9ytQ6pGuCMVsONtHZ/HuDn5sa7sa4mJPPrwA00F1wNNFYIQ9kigg1gi Qej7GRBTotmZIsY6vx1Aseefjqt8FToAOX/mK7kZYuLvbaNxsFmnW0AiyNzXk7IuKznv NwcgTiVvYu5NTcYJwh7Vg3rBi8bGqA/sPf1GPASYmrd6+nJzEU37dlpXI1id9gcIpSGg AHJ2r05dvMc/iF9mGjhE/3UmmnezMXg/Tq60oFybVam5aO1bVIyu49Quy5agF82HWWTw 10Dw== X-Gm-Message-State: ACgBeo3Dkna0PrmECa6SJpuCjLdxYvIogmfzczdPYLHxk6zvha7eX7Gz 8k/c21lY2xFfF6hQ/nxlmwlysw== X-Google-Smtp-Source: AA6agR4FCa85+ISTKv3H1d1x6uFzYyQLjUdlJZJ3lzgsxfSiH4+SIbwfwkEuptV+7e+VebV7N1prXA== X-Received: by 2002:a2e:9e11:0:b0:268:c7d0:9662 with SMTP id e17-20020a2e9e11000000b00268c7d09662mr4830958ljk.309.1662801278102; Sat, 10 Sep 2022 02:14:38 -0700 (PDT) Received: from krzk-bin.. (78-11-189-27.static.ip.netia.com.pl. [78.11.189.27]) by smtp.gmail.com with ESMTPSA id x22-20020a19e016000000b0048b26d4bb64sm201552lfg.40.2022.09.10.02.14.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Sep 2022 02:14:37 -0700 (PDT) From: Krzysztof Kozlowski To: Srinivas Kandagatla , Banajit Goswami , Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Liam Girdwood , Mark Brown , 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 v4 01/15] arm64: dts: qcom: sdm630: align APR services node names with dtschema Date: Sat, 10 Sep 2022 11:14:14 +0200 Message-Id: <20220910091428.50418-2-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220910091428.50418-1-krzysztof.kozlowski@linaro.org> References: <20220910091428.50418-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org DT schema expects APR services node names to be "service": qcom/sdm850-lenovo-yoga-c630.dtb: remoteproc-adsp: glink-edge:apr: 'apr-service@3', 'apr-service@4', 'apr-service@7', 'apr-service@8', 'qcom,glink-channels', 'qcom,intents' do not match any of the regexes: '^service@[1-9a-d]$', 'pinctrl-[0-9]+' Signed-off-by: Krzysztof Kozlowski Reviewed-by: Srinivas Kandagatla --- arch/arm64/boot/dts/qcom/sdm630.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sdm630.dtsi b/arch/arm64/boot/dts/qcom/sdm630.dtsi index 9ae6610af93a..3cd1f40b44fb 100644 --- a/arch/arm64/boot/dts/qcom/sdm630.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm630.dtsi @@ -2224,12 +2224,12 @@ apr { #address-cells = <1>; #size-cells = <0>; - q6core { + service@3 { reg = ; compatible = "qcom,q6core"; }; - q6afe: apr-service@4 { + q6afe: service@4 { compatible = "qcom,q6afe"; reg = ; q6afedai: dais { @@ -2240,7 +2240,7 @@ q6afedai: dais { }; }; - q6asm: apr-service@7 { + q6asm: service@7 { compatible = "qcom,q6asm"; reg = ; q6asmdai: dais { @@ -2252,7 +2252,7 @@ q6asmdai: dais { }; }; - q6adm: apr-service@8 { + q6adm: service@8 { compatible = "qcom,q6adm"; reg = ; q6routing: routing { From patchwork Sat Sep 10 09:14:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 604649 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 5F2B9C6FA82 for ; Sat, 10 Sep 2022 09:14:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229504AbiIJJOr (ORCPT ); Sat, 10 Sep 2022 05:14:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44728 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229623AbiIJJOn (ORCPT ); Sat, 10 Sep 2022 05:14:43 -0400 Received: from mail-lj1-x22d.google.com (mail-lj1-x22d.google.com [IPv6:2a00:1450:4864:20::22d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D3AEA18B1B for ; Sat, 10 Sep 2022 02:14:40 -0700 (PDT) Received: by mail-lj1-x22d.google.com with SMTP id z23so4787709ljk.1 for ; Sat, 10 Sep 2022 02:14:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=8QkNF8EHcAEMbV0p0CldmJdisF79bfeyCTRVHy2ZadQ=; b=yyBttUYuH4tygXW9qJQM11T+7T0n/4wrSezsTZBpgSmRMRNGIA1xoEodyTIncSJJLV GmIGoZnDkFYAkb6S7I7Sc3NJdyFWoU+RJiyPmMLQUOvJhPbgef/PwaPDKOjftN4PqwVB 8wsZEMpQf8rx77PeUwc+Dxe8Bfc3vdDuvPqqnLG4Jy5ETuKR/y7ffILB/Z9itZmgnnpD d3SWYysVCP629T/Pj8f87jqkM47+FM4DhdkD2uCR9I/YzzRnpfvQ7DPudQoPenp6/Vo/ Wy2hjQNtX3xjMNv3n/h2xG1H4JgHKtc//MkclS6ejBswuNJXAzPBXlksKkPlw7bK1XmE 7Eiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=8QkNF8EHcAEMbV0p0CldmJdisF79bfeyCTRVHy2ZadQ=; b=6uwTBS/asAc9+lKXSULe5YieIz0la+NSQpymQwUGph/mONYfQdtBbTKaqsZ3xn7ogm OF1INzeYfa9+MlYnBrFN0eabZXoQd694toIosbveeNiMU8IG2MVqMUBP3T7iyy9bFCA5 D3L7BeJdOloCd6Q1G5vEeRt917wDd27tO6IAD1I3j+LscAAlyfuwQJ+1wV3Ip1Qw8N1M KW1kHZ2mzLtXsv/zWDlTzeUt/3+GOAU3OssaouJkiInPgyvvEcZQiRWW8GjRIiVBk7sD Lx5i7EAmFq09ABkow7uBJzq9T7tSIrXnteR79/OZNOnIEfs2kX4HV674ewY4IF3uSzj1 R+mA== X-Gm-Message-State: ACgBeo0HZCwg4BKGPNA0WI4dLsi/9rAjypbplNuTw6b45URtRiDNrRYG GGdbJ2HS0fktFwzgj4Xp55lOlA== X-Google-Smtp-Source: AA6agR7v11ee1WBu70O5QlG0YOmv4myZzh9DgvTOA74X3aEZRne8qOWVCMTlTMzzFtsUC/6E2bJRdQ== X-Received: by 2002:a2e:8ed9:0:b0:26b:e22c:5e71 with SMTP id e25-20020a2e8ed9000000b0026be22c5e71mr2189554ljl.15.1662801279171; Sat, 10 Sep 2022 02:14:39 -0700 (PDT) Received: from krzk-bin.. (78-11-189-27.static.ip.netia.com.pl. [78.11.189.27]) by smtp.gmail.com with ESMTPSA id x22-20020a19e016000000b0048b26d4bb64sm201552lfg.40.2022.09.10.02.14.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Sep 2022 02:14:38 -0700 (PDT) From: Krzysztof Kozlowski To: Srinivas Kandagatla , Banajit Goswami , Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Liam Girdwood , Mark Brown , alsa-devel@alsa-project.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski , Steev Klimaszewski Subject: [PATCH v4 02/15] arm64: dts: qcom: sdm845: align APR services node names with dtschema Date: Sat, 10 Sep 2022 11:14:15 +0200 Message-Id: <20220910091428.50418-3-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220910091428.50418-1-krzysztof.kozlowski@linaro.org> References: <20220910091428.50418-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org DT schema expects APR services node names to be "service": qcom/sdm630-sony-xperia-nile-voyager.dtb: remoteproc@15700000: glink-edge:apr:service@4: 'dais' does not match any of the regexes: '^.*@[0-9a-f]+$', 'pinctrl-[0-9]+' Signed-off-by: Krzysztof Kozlowski Reviewed-by: Srinivas Kandagatla Tested-by: Steev Klimaszewski --- arch/arm64/boot/dts/qcom/sdm845.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi index 347c3abc117b..627e32515d29 100644 --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi @@ -767,13 +767,13 @@ apr { #size-cells = <0>; qcom,intents = <512 20>; - apr-service@3 { + service@3 { reg = ; compatible = "qcom,q6core"; qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd"; }; - q6afe: apr-service@4 { + q6afe: service@4 { compatible = "qcom,q6afe"; reg = ; qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd"; @@ -785,7 +785,7 @@ q6afedai: dais { }; }; - q6asm: apr-service@7 { + q6asm: service@7 { compatible = "qcom,q6asm"; reg = ; qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd"; @@ -798,7 +798,7 @@ q6asmdai: dais { }; }; - q6adm: apr-service@8 { + q6adm: service@8 { compatible = "qcom,q6adm"; reg = ; qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd"; From patchwork Sat Sep 10 09:14:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 604648 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 17742C6FA82 for ; Sat, 10 Sep 2022 09:15:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229730AbiIJJPA (ORCPT ); Sat, 10 Sep 2022 05:15:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44852 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229661AbiIJJOq (ORCPT ); Sat, 10 Sep 2022 05:14:46 -0400 Received: from mail-lj1-x22e.google.com (mail-lj1-x22e.google.com [IPv6:2a00:1450:4864:20::22e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 989DE1D0CD for ; Sat, 10 Sep 2022 02:14:44 -0700 (PDT) Received: by mail-lj1-x22e.google.com with SMTP id v6so4806370ljj.0 for ; Sat, 10 Sep 2022 02:14:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=F43WJbqoo0esyv4lpLD+5bCe2x3EVG4sANVKIPN1Vsw=; b=gjQYC5tvkqwyAfGwYyZaxzlELAmUX4A4Oc5Oq/5KenDEAxOminiHi9muEYn8A5WejU Uk7OxU1imFSFvjNZQNUToxTlaFjq4NRad7xRkUJXd6zsnr6J0NkZMmVT7BiGI8N0Prcz 0xaLNWYTVpp+8UMU318UqhCqWbUJkiHbtO03y2f+rLdIqBiDNIe6snfySzCuhjsygfTy AlOEfVBmxbrSoPXrmO7/0ECoPXMyPeq1hXfPNzTgGDV/MzAZWzq8ksfA7viiIiV3+DTI nfNqUPkNCi2v8m+zsAHxBFrvrlDropSFV8TWS+4v1ktuu5mWDxRc29Uz3cQQQuAZpG9r sa8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=F43WJbqoo0esyv4lpLD+5bCe2x3EVG4sANVKIPN1Vsw=; b=nKJ7g4UxAKeYswDhn6HvZVTfQ4QHbgNhNcLsQQKT0QPLs8RCXRve+0oIVMrCCXGMHD tTHJVmuN4UquBH4y8XwdB1MHwZxJZLPLytQ5BlY3u+YmWiECigtpf9twf0K9FPEqHhOy LrQoSmHWybMvd3AosunvP0KoUX7dwxbugu3FCDja9gXUhQ4jRbXyM7jBEDKBACoMXO++ 8AARkEfCLN/TgQmEmo7oSGuyFuRYOjAwdchODE0FuRkO71tOUnE2Ojwezdj2/D5bNoPL OtSmldc1V60XO/sLssRsRzpxORD8ywej+Fgk7EvkGzzEhYVYiHHZ/EQ5aXXyMJsUhbcB Qunw== X-Gm-Message-State: ACgBeo3VREYwx8lA3NXi7IWo2/X5MiUxFWyWelDn5jjnexS3ZOAp8O08 8KbHKBpF6XoSd93yI8lyVCSuOA== X-Google-Smtp-Source: AA6agR4rhGrcfIu0K6zucUbz27AGSZJkv8AZnGPF287UzI8abX8D1GX4w+zjXIJoDrL3P/ZIcJk53Q== X-Received: by 2002:a2e:958a:0:b0:26a:a393:4480 with SMTP id w10-20020a2e958a000000b0026aa3934480mr4974663ljh.490.1662801282674; Sat, 10 Sep 2022 02:14:42 -0700 (PDT) Received: from krzk-bin.. (78-11-189-27.static.ip.netia.com.pl. [78.11.189.27]) by smtp.gmail.com with ESMTPSA id x22-20020a19e016000000b0048b26d4bb64sm201552lfg.40.2022.09.10.02.14.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Sep 2022 02:14:42 -0700 (PDT) From: Krzysztof Kozlowski To: Srinivas Kandagatla , Banajit Goswami , Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Liam Girdwood , Mark Brown , 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 v4 05/15] arm64: dts: qcom: sdm845: align dai node names with dtschema Date: Sat, 10 Sep 2022 11:14:18 +0200 Message-Id: <20220910091428.50418-6-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220910091428.50418-1-krzysztof.kozlowski@linaro.org> References: <20220910091428.50418-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org DT schema expects DAI node names to be "dai": qcom/sdm845-xiaomi-beryllium.dtb: dais: 'qi2s@22' does not match any of the regexes: '^dai@[0-9]+$', 'pinctrl-[0-9]+' Signed-off-by: Krzysztof Kozlowski Reviewed-by: Srinivas Kandagatla --- arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 2 +- arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts | 2 +- arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts index 132417e2d11e..2110a5893149 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts @@ -651,7 +651,7 @@ led@5 { /* QUAT I2S Uses 4 I2S SD Lines for audio on LT9611 HDMI Bridge */ &q6afedai { - qi2s@22 { + dai@22 { reg = ; qcom,sd-lines = <0 1 2 3>; }; diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts index 0f470cf1ed1c..68e2a07a01dc 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts @@ -338,7 +338,7 @@ resin { /* QUAT I2S Uses 1 I2S SD Line for audio on TAS2559/60 amplifiers */ &q6afedai { - qi2s@22 { + dai@22 { reg = ; qcom,sd-lines = <0>; }; diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts index afc17e4d403f..4f6f1ce7286c 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts @@ -544,8 +544,8 @@ resin { }; &q6afedai { - qi2s@22 { - reg = <22>; + dai@22 { + reg = ; qcom,sd-lines = <0>; }; }; From patchwork Sat Sep 10 09:14:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 604647 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 C6380ECAAD5 for ; Sat, 10 Sep 2022 09:15:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229697AbiIJJPF (ORCPT ); Sat, 10 Sep 2022 05:15:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45512 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229693AbiIJJOw (ORCPT ); Sat, 10 Sep 2022 05:14:52 -0400 Received: from mail-lf1-x131.google.com (mail-lf1-x131.google.com [IPv6:2a00:1450:4864:20::131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6DCD115A2C for ; Sat, 10 Sep 2022 02:14:47 -0700 (PDT) Received: by mail-lf1-x131.google.com with SMTP id f14so5739796lfg.5 for ; Sat, 10 Sep 2022 02:14:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=Om7NL/8n/AZHbaNF9gisHUFy/iTMOZIGCGU/AWMpqjM=; b=shixtIhBSAZGcGZxoWGvxbe94FCKP7YSUgKsBA+rsiVc1TNpTivGMg2TRyabz7coMR jV4cawvAYBdMCi29AkwxoEbUe2qGu8t9Ik7Zq8i8cLKdaV/sxnJyxiiyoXpZEoELiA1v AGMCzIejMjD1Ts1xNVvtJfkqYoimBVjSsvLhab7sGSGO6OxRTIAKI4Wt/hEk663pVo8X VmqDckdFXxdI9U0UShm4yqrc1Aqf6370/kjPPQHRrhI1cxQiCBKWaZpfwkJ3wM+RyAvC XDbjqPdkaCAmprKKysIOKL1RpwYhuMOeB7h0x9XIBoqlykC2dDMXecckjxRKRSFr+jVx 1ECQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=Om7NL/8n/AZHbaNF9gisHUFy/iTMOZIGCGU/AWMpqjM=; b=yQeSLNzJa5HZZGQTiRJF23Z24Vu3cy7VFe7n0Ib4gWptChXZWm5A5+aQItcWDjkJ24 QQZ3RnxiIGtvJ7JzF6/Odi9tVG7Pl7XLAmivXUwnCrtVvmw5a1CiaDLRTPelydfgZ33e wwZTW99n2Qe7Fe78Ya+Io3KG+uMAHBcqBV/AnJQnXypaGZuelynb9lK1WunF490FojoC ritN2zaPBSOQbBUeWOQeq5/4vVe/o1/Q0dPDM2rGfTIPTRM3M+rb/1MT2zc6VJQjqbL/ YVJTwYEhIFD9t9mSAFvad1/tRLIbz/yH9a6+KE1DpFfu8NxGt0Jo/YPoLf0OEWpcN4tF Im7w== X-Gm-Message-State: ACgBeo334KDKOYFnaaEfxv245Bdl2paSq3jSyB95vmDazmPTVWWrrTar eSBFXtO6beV1L/sAWvMBmk0cew== X-Google-Smtp-Source: AA6agR65F1UZGoG65loqPXfIrJaLts3AmGwOQ+PcGtwW4XTYY0dznF07HfSCsWDWPNHFdSwvMKEi0Q== X-Received: by 2002:a19:910f:0:b0:498:7212:10c0 with SMTP id t15-20020a19910f000000b00498721210c0mr4374129lfd.39.1662801285269; Sat, 10 Sep 2022 02:14:45 -0700 (PDT) Received: from krzk-bin.. (78-11-189-27.static.ip.netia.com.pl. [78.11.189.27]) by smtp.gmail.com with ESMTPSA id x22-20020a19e016000000b0048b26d4bb64sm201552lfg.40.2022.09.10.02.14.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Sep 2022 02:14:44 -0700 (PDT) From: Krzysztof Kozlowski To: Srinivas Kandagatla , Banajit Goswami , Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Liam Girdwood , Mark Brown , 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 v4 07/15] arm64: dts: qcom: qrb5165-rb5: align dai node names with dtschema Date: Sat, 10 Sep 2022 11:14:20 +0200 Message-Id: <20220910091428.50418-8-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220910091428.50418-1-krzysztof.kozlowski@linaro.org> References: <20220910091428.50418-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org DT schema expects DAI node names to be "dai": qcom/qrb5165-rb5.dtb: dais: 'qi2s@16', 'qi2s@20' do not match any of the regexes: '^dai@[0-9]+$', 'pinctrl-[0-9]+' Signed-off-by: Krzysztof Kozlowski Reviewed-by: Srinivas Kandagatla --- arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts index bf8077a1cf9a..d39ca3671477 100644 --- a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts +++ b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts @@ -867,7 +867,7 @@ &qupv3_id_2 { }; &q6afedai { - qi2s@16 { + dai@16 { reg = ; qcom,sd-lines = <0 1 2 3>; }; @@ -875,7 +875,7 @@ qi2s@16 { /* TERT I2S Uses 1 I2S SD Lines for audio on LT9611 HDMI Bridge */ &q6afedai { - qi2s@20 { + dai@20 { reg = ; qcom,sd-lines = <0>; }; From patchwork Sat Sep 10 09:14:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 604646 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 1FEADC6FA82 for ; Sat, 10 Sep 2022 09:15:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229541AbiIJJPN (ORCPT ); Sat, 10 Sep 2022 05:15:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44882 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229736AbiIJJPA (ORCPT ); Sat, 10 Sep 2022 05:15:00 -0400 Received: from mail-lf1-x132.google.com (mail-lf1-x132.google.com [IPv6:2a00:1450:4864:20::132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 42F6C2872F for ; Sat, 10 Sep 2022 02:14:49 -0700 (PDT) Received: by mail-lf1-x132.google.com with SMTP id f9so5976216lfr.3 for ; Sat, 10 Sep 2022 02:14:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=mUmppME7zaLO9Gm03potROZ5imNm8303jvDKrM7wFXw=; b=VpzzwR2FyuPMAh6rLDWLYBcHRF5yVL5TxPR0yNX5Uzx2ueU4Puxldwb0cotvNA574D y+s96KYptf+kQx8tKai4bK86dCupISuhDfPMN0G/RbAxy9wtqJOdPKEBFGhl9TYxJv07 DNnxj9WpiyowGaf4mTJWP+zElb3vQxwBtPJO7GdNFdeIpkCpO3f55RV+iq6MZu68pR2D 3MjWIkOvFcsvZkoyEx0kU5lBBvRGHKCc4YdI1Li3mtfuFV5VpT3NjL3l8E0jAeSGt/uo gOJJwDvmCb7bsdwcwhQBUdByuOESf4Wh7NQY044NdbCtQwNmMCeTyZx1aJ3z6aB3uVnC uW8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=mUmppME7zaLO9Gm03potROZ5imNm8303jvDKrM7wFXw=; b=sU4h5wOMGoct+dC2l98y4zV8KVLbWNsRn4UzqsL4/d/gYh6VNqwhG3kNRJVXY7ijPT kBKsTgzYa2x6mdhpX3zf9nv09LlowOY8OrCaVZPi4xolJQ0vG/yLSwr9qayGALj/rBZG xbUnf3DOnpqAp+YczwG1JQ7PqDySpyQVEn8zdjGbAmR+E1GJy62lYVmB3t9Y5OhR+fB5 NOnz5a6zaRg1mOtQJFFhQBNimFkpKynUIIOukiwkLQL9aaz2/BdTMrOonTpvs/kEeY3b pJ90umTQHILreKe5wX59efUyvgOn7Dsrk4pnEAXXVYVaNMaML+4hTFNJ5usQCfiXTGB8 uo4Q== X-Gm-Message-State: ACgBeo1CxotGM1xIkze0aHnWOIPL27HndBSUwgNJm3rjSyEH/js2WYiQ Z3kVHlMYz4R6vp3fH8cHL9fw9A== X-Google-Smtp-Source: AA6agR6DfeZZgjI4BrsQk7LgRZnNDJeVAZ22fLaPcjtXgmFYQkP+bN5LCy9I/Gbd7OSSVy6qcG2Skg== X-Received: by 2002:a05:6512:3501:b0:496:d15:e614 with SMTP id h1-20020a056512350100b004960d15e614mr6158497lfs.194.1662801289123; Sat, 10 Sep 2022 02:14:49 -0700 (PDT) Received: from krzk-bin.. (78-11-189-27.static.ip.netia.com.pl. [78.11.189.27]) by smtp.gmail.com with ESMTPSA id x22-20020a19e016000000b0048b26d4bb64sm201552lfg.40.2022.09.10.02.14.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Sep 2022 02:14:48 -0700 (PDT) From: Krzysztof Kozlowski To: Srinivas Kandagatla , Banajit Goswami , Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Liam Girdwood , Mark Brown , 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 v4 10/15] ASoC: dt-bindings: qcom,q6asm: convert to dtschema Date: Sat, 10 Sep 2022 11:14:23 +0200 Message-Id: <20220910091428.50418-11-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220910091428.50418-1-krzysztof.kozlowski@linaro.org> References: <20220910091428.50418-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Convert Qualcomm Audio Stream Manager (Q6ASM) bindings to DT schema. The original bindings documented: 1. APR service node with compatibles: "qcom,q6asm" and "qcom,q6asm-v.", 2. actual DAIs child node with compatible "qcom,q6asm-dais". The conversion entirely drops (1) because the compatible is already documented in bindings/soc/qcom/qcom,apr.yaml. The "qcom,q6asm-v." on the other hand is not used at all - neither in existing DTS, nor in downstream sources - so versions seems to be fully auto-detectable. Another change done in conversion is adding "iommus" property, which is already used in DTS and Linux driver. Signed-off-by: Krzysztof Kozlowski --- Changes since v3: 1. Re-order patches, so the change to apr.yaml happens here and we can avoid early `make dt_binding_check` warning. Changes since v2: 1. Rename to qcom,q6asm-dais.yaml (Rob) 2. Extend commit msg. Changes since v1: 1. New patch. --- .../bindings/soc/qcom/qcom,apr.yaml | 6 +- .../bindings/sound/qcom,q6asm-dais.yaml | 112 ++++++++++++++++++ .../devicetree/bindings/sound/qcom,q6asm.txt | 70 ----------- 3 files changed, 117 insertions(+), 71 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6asm-dais.yaml delete mode 100644 Documentation/devicetree/bindings/sound/qcom,q6asm.txt diff --git a/Documentation/devicetree/bindings/soc/qcom/qcom,apr.yaml b/Documentation/devicetree/bindings/soc/qcom/qcom,apr.yaml index ac508622dc04..a1a8f77beef7 100644 --- a/Documentation/devicetree/bindings/soc/qcom/qcom,apr.yaml +++ b/Documentation/devicetree/bindings/soc/qcom/qcom,apr.yaml @@ -103,8 +103,12 @@ patternProperties: unevaluatedProperties: false dais: - # TODO: Waiting for Documentation/devicetree/bindings/sound/qcom,q6asm.txt type: object + oneOf: + - $ref: /schemas/sound/qcom,q6apm-dai.yaml# + - $ref: /schemas/sound/qcom,q6dsp-lpass-ports.yaml# + - $ref: /schemas/sound/qcom,q6asm-dais.yaml# + unevaluatedProperties: false description: Qualcomm DSP audio ports routing: diff --git a/Documentation/devicetree/bindings/sound/qcom,q6asm-dais.yaml b/Documentation/devicetree/bindings/sound/qcom,q6asm-dais.yaml new file mode 100644 index 000000000000..8deb8ffb143b --- /dev/null +++ b/Documentation/devicetree/bindings/sound/qcom,q6asm-dais.yaml @@ -0,0 +1,112 @@ +# SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/qcom,q6asm-dais.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm Audio Stream Manager (Q6ASM) + +maintainers: + - Krzysztof Kozlowski + - Srinivas Kandagatla + +description: + Q6ASM is one of the APR audio services on Q6DSP. Each of its subnodes + represent a dai with board specific configuration. + +properties: + compatible: + enum: + - qcom,q6asm-dais + + iommus: + maxItems: 1 + + "#sound-dai-cells": + const: 1 + + "#address-cells": + const: 1 + + "#size-cells": + const: 0 + +patternProperties: + "^dai@[0-9]+$": + type: object + description: + Q6ASM Digital Audio Interface + + properties: + reg: + maxItems: 1 + + direction: + $ref: /schemas/types.yaml#/definitions/uint32 + enum: [0, 1, 2] + description: | + The direction of the dai stream:: + - Q6ASM_DAI_TX_RX (0) for both tx and rx + - Q6ASM_DAI_TX (1) for only tx (Capture/Encode) + - Q6ASM_DAI_RX (2) for only rx (Playback/Decode) + + is-compress-dai: + type: boolean + description: + Compress offload dai. + + dependencies: + is-compress-dai: ["direction"] + + required: + - reg + + additionalProperties: false + +required: + - compatible + - "#sound-dai-cells" + - "#address-cells" + - "#size-cells" + +additionalProperties: false + +examples: + - | + #include + #include + + apr { + compatible = "qcom,apr-v2"; + qcom,domain = ; + #address-cells = <1>; + #size-cells = <0>; + + service@7 { + compatible = "qcom,q6asm"; + reg = ; + qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd"; + + dais { + compatible = "qcom,q6asm-dais"; + iommus = <&apps_smmu 0x1821 0x0>; + #address-cells = <1>; + #size-cells = <0>; + #sound-dai-cells = <1>; + + dai@0 { + reg = <0>; + }; + + dai@1 { + reg = <1>; + }; + + dai@2 { + reg = <2>; + is-compress-dai; + direction = <1>; + }; + }; + }; + }; diff --git a/Documentation/devicetree/bindings/sound/qcom,q6asm.txt b/Documentation/devicetree/bindings/sound/qcom,q6asm.txt deleted file mode 100644 index 0d0075125243..000000000000 --- a/Documentation/devicetree/bindings/sound/qcom,q6asm.txt +++ /dev/null @@ -1,70 +0,0 @@ -Qualcomm Audio Stream Manager (Q6ASM) binding - -Q6ASM is one of the APR audio service on Q6DSP. -Please refer to qcom,apr.txt for details of the common apr service bindings -used by the apr service device. - -- but must contain the following property: - -- compatible: - Usage: required - Value type: - Definition: must be "qcom,q6asm-v.". - Or "qcom,q6asm" where the version number can be queried - from DSP. - example "qcom,q6asm-v2.0" - -= ASM DAIs (Digital Audio Interface) -"dais" subnode of the ASM node represents dai specific configuration - -- compatible: - Usage: required - Value type: - Definition: must be "qcom,q6asm-dais". - -- #sound-dai-cells - Usage: required - Value type: - Definition: Must be 1 - -== ASM DAI is subnode of "dais" and represent a dai, it includes board specific -configuration of each dai. Must contain the following properties. - -- reg - Usage: required - Value type: - Definition: Must be dai id - -- direction: - Usage: Required for Compress offload dais - Value type: - Definition: Specifies the direction of the dai stream - Q6ASM_DAI_TX_RX (0) for both tx and rx - Q6ASM_DAI_TX (1) for only tx (Capture/Encode) - Q6ASM_DAI_RX (2) for only rx (Playback/Decode) - -- is-compress-dai: - Usage: Required for Compress offload dais - Value type: - Definition: present for Compress offload dais - - -= EXAMPLE -#include - -apr-service@7 { - compatible = "qcom,q6asm"; - reg = ; - q6asmdai: dais { - compatible = "qcom,q6asm-dais"; - #address-cells = <1>; - #size-cells = <0>; - #sound-dai-cells = <1>; - - dai@0 { - reg = <0>; - direction = ; - is-compress-dai; - }; - }; -}; From patchwork Sat Sep 10 09:14:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 604644 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 A997AC6FA83 for ; Sat, 10 Sep 2022 09:16:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229670AbiIJJQF (ORCPT ); Sat, 10 Sep 2022 05:16:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48334 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229706AbiIJJPV (ORCPT ); Sat, 10 Sep 2022 05:15:21 -0400 Received: from mail-lf1-x130.google.com (mail-lf1-x130.google.com [IPv6:2a00:1450:4864:20::130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 31B292DA8A for ; Sat, 10 Sep 2022 02:14:52 -0700 (PDT) Received: by mail-lf1-x130.google.com with SMTP id u18so6696524lfo.8 for ; Sat, 10 Sep 2022 02:14:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=1cq2Cz6+Sy/tLxBRXynhhig1VTaXAXEwiLaRAUKokT0=; b=rDJ5SqyF0Ajf/iIhY3qigKE1/djVs2SBb1CDat7xU4E76GbX2Sxcv+F+kMXDS0Ef60 dlZ+7FMqkqNCH6/1eIjoJQf3OwEre1m/Bfs8sbPFnMJRQgVagX86tN5XbyZupxVnwB6K u+G8zCl+mXQtm4TNA85+W/scSjxyAZa4f/uX74q1bt8mc05VjprOHhWxMOO++R8t0jTs GDxD8w1vcbhussJDB7jxjqj/jKDW8BctaBatLmfv243uDAPQQiUXcklhPrqwn2AEpDwU go+VeKEMnizvem+i5XrZZqnRoRW9KFg8Wq/pYVTs5nV9GRFXe/XbIJnRoRV4nJpIwlMi kgcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=1cq2Cz6+Sy/tLxBRXynhhig1VTaXAXEwiLaRAUKokT0=; b=SZK4oN2veAQnkCPRgmp5HN1jCI20xRHIX8BSWVNlaAuFLiUSqe4CmVQr5YYyhNCK9i JbLUcg22rp2XtUo4wBV4c00mJzdzgvnT+2M5MQqbKjD/VLwBox+lc3xZQNO4fDY55GJY 5vEbf6ccg8TR8syrU+uXBVpcP8sIDdRKrntTWjB2cXpJTUzHNlCmW7LxNNKeLETDphoU JeGZRLeKRCJ6bbYqcWqLqRit/NlyRpNGUj9h+5Yron7DIGJpjGUcaiafsbhafNVI7Q4F vI1LOlgoWpNZbA7X71GoVewSVNaBUFIv0p+uo+JslNy70WvQwUg4qeHH/gcDkqqnmAoH Ishw== X-Gm-Message-State: ACgBeo3MGfK88kWU+Ei4uu5W5Y8DavxHHOtXAJDxmAlPslX7Dr+VgdYh bs27ybpPfKGS1wIQCv0gMwXZXw== X-Google-Smtp-Source: AA6agR7RKod47U0kD5QSHRgIkY8q0SH4jTo0lBV/oMq4KCefwxXWIcDQ7tqIanhG61C70/2ETM7CGg== X-Received: by 2002:a19:520b:0:b0:498:f580:5cb5 with SMTP id m11-20020a19520b000000b00498f5805cb5mr3098607lfb.513.1662801290572; Sat, 10 Sep 2022 02:14:50 -0700 (PDT) Received: from krzk-bin.. (78-11-189-27.static.ip.netia.com.pl. [78.11.189.27]) by smtp.gmail.com with ESMTPSA id x22-20020a19e016000000b0048b26d4bb64sm201552lfg.40.2022.09.10.02.14.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Sep 2022 02:14:50 -0700 (PDT) From: Krzysztof Kozlowski To: Srinivas Kandagatla , Banajit Goswami , Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Liam Girdwood , Mark Brown , 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 v4 11/15] ASoC: dt-bindings: qcom,q6adm: convert to dtschema Date: Sat, 10 Sep 2022 11:14:24 +0200 Message-Id: <20220910091428.50418-12-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220910091428.50418-1-krzysztof.kozlowski@linaro.org> References: <20220910091428.50418-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Convert Qualcomm Audio Device Manager (Q6ADM) bindings to DT schema. The original bindings documented: 1. APR service node with compatibles: "qcom,q6adm" and "qcom,q6adm-v.", 2. Routing child node with compatible "qcom,q6adm-routing". The conversion entirely drops (1) because the compatible is already documented in bindings/soc/qcom/qcom,apr.yaml. The "qcom,q6adm-v." on the other hand is not used at all - neither in existing DTS, nor in downstream sources - so versions seems to be fully auto-detectable. Signed-off-by: Krzysztof Kozlowski --- Changes since v3: 1. New patch. --- .../bindings/soc/qcom/qcom,apr.yaml | 3 +- .../bindings/sound/qcom,q6adm-routing.yaml | 52 +++++++++++++++++++ .../devicetree/bindings/sound/qcom,q6adm.txt | 39 -------------- 3 files changed, 54 insertions(+), 40 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6adm-routing.yaml delete mode 100644 Documentation/devicetree/bindings/sound/qcom,q6adm.txt diff --git a/Documentation/devicetree/bindings/soc/qcom/qcom,apr.yaml b/Documentation/devicetree/bindings/soc/qcom/qcom,apr.yaml index a1a8f77beef7..54328d74af85 100644 --- a/Documentation/devicetree/bindings/soc/qcom/qcom,apr.yaml +++ b/Documentation/devicetree/bindings/soc/qcom/qcom,apr.yaml @@ -112,8 +112,9 @@ patternProperties: description: Qualcomm DSP audio ports routing: - # TODO: Waiting for Documentation/devicetree/bindings/sound/qcom,q6adm.txt type: object + $ref: /schemas/sound/qcom,q6adm-routing.yaml# + unevaluatedProperties: false description: Qualcomm DSP LPASS audio routing qcom,protection-domain: diff --git a/Documentation/devicetree/bindings/sound/qcom,q6adm-routing.yaml b/Documentation/devicetree/bindings/sound/qcom,q6adm-routing.yaml new file mode 100644 index 000000000000..d0f7a79e240a --- /dev/null +++ b/Documentation/devicetree/bindings/sound/qcom,q6adm-routing.yaml @@ -0,0 +1,52 @@ +# SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/qcom,q6adm-routing.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm Audio Device Manager (Q6ADM) routing + +maintainers: + - Krzysztof Kozlowski + - Srinivas Kandagatla + +description: + Qualcomm Audio Device Manager (Q6ADM) routing node represents routing + specific configuration. + +properties: + compatible: + enum: + - qcom,q6adm-routing + + "#sound-dai-cells": + const: 0 + +required: + - compatible + - "#sound-dai-cells" + +additionalProperties: false + +examples: + - | + #include + #include + + apr { + compatible = "qcom,apr-v2"; + qcom,domain = ; + #address-cells = <1>; + #size-cells = <0>; + + service@8 { + compatible = "qcom,q6adm"; + reg = ; + qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd"; + + routing { + compatible = "qcom,q6adm-routing"; + #sound-dai-cells = <0>; + }; + }; + }; diff --git a/Documentation/devicetree/bindings/sound/qcom,q6adm.txt b/Documentation/devicetree/bindings/sound/qcom,q6adm.txt deleted file mode 100644 index 15c353a20de8..000000000000 --- a/Documentation/devicetree/bindings/sound/qcom,q6adm.txt +++ /dev/null @@ -1,39 +0,0 @@ -Qualcomm Audio Device Manager (Q6ADM) binding - -Q6ADM is one of the APR audio service on Q6DSP. -Please refer to qcom,apr.txt for details of the coommon apr service bindings -used by the apr service device. - -- but must contain the following property: - -- compatible: - Usage: required - Value type: - Definition: must be "qcom,q6adm-v.". - Or "qcom,q6adm" where the version number can be queried - from DSP. - example "qcom,q6adm-v2.0" - - -= ADM routing -"routing" subnode of the ADM node represents adm routing specific configuration - -- compatible: - Usage: required - Value type: - Definition: must be "qcom,q6adm-routing". - -- #sound-dai-cells - Usage: required - Value type: - Definition: Must be 0 - -= EXAMPLE -apr-service@8 { - compatible = "qcom,q6adm"; - reg = ; - q6routing: routing { - compatible = "qcom,q6adm-routing"; - #sound-dai-cells = <0>; - }; -}; From patchwork Sat Sep 10 09:14:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 604643 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 8250EC6FA83 for ; Sat, 10 Sep 2022 09:16:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229849AbiIJJQL (ORCPT ); Sat, 10 Sep 2022 05:16:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47136 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229850AbiIJJPv (ORCPT ); Sat, 10 Sep 2022 05:15:51 -0400 Received: from mail-lj1-x234.google.com (mail-lj1-x234.google.com [IPv6:2a00:1450:4864:20::234]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9B29A1ADA6 for ; Sat, 10 Sep 2022 02:14:53 -0700 (PDT) Received: by mail-lj1-x234.google.com with SMTP id p5so4729861ljc.13 for ; Sat, 10 Sep 2022 02:14:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=Tn2FE4uhx3qd+o+7Fk9TdVeJts1VUhiNI+L2cf12iKs=; b=NZwn9py8H3WOeWfR1QBFDAoAnj6TSmEodR/wnsLqWNfQl6QjD+CQP8wFRAEVLHYwm4 yITT3sZuGaDuEa9eppdf6KN6oLY97GRyR5jYOZ6bw/2m60mILwjlXXEE6xknfGhjPc8n EpsBERDfQslDsnsJ3jOEfU3IyIGsniScMIC7w4pXxJlGxgUUGollwRCHWBbAhBCMkZTB WnW/1SDZgPLgFZ6BjkCMMjKeDopXYqbT38Ua6E3nsXadpC2kyKOp8S8h8/LBclbwpgkR Uoyxu+Oy9TcRkFunH7abFZEC6uqku2BwAAQoti3QzhhkZw1G5/UU1EMaXhQQ9JTEyFxE efzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=Tn2FE4uhx3qd+o+7Fk9TdVeJts1VUhiNI+L2cf12iKs=; b=F7iuK6OOSY/rHfye3fx5fUq6+Eje9D3CGcBDcqrzC4t5tjH2m04uI1puIMgcD1ZWZX R7YdOp73QkMoB9tjv0ROVWojbzSN+HPa16xY8LqxQqYY1lNflj1H4OJdsngUGVOAL+t7 VEKL58JyWurten/TtvTLOscDCJ1VwuJw4N1gNZzGRDItYnmwPKx938pfPMT0PvmLI+O9 SPhJ7uMvDaq8/p7uLdy55vbJkXXE5t8su4tIeC3VqLUUpWDBw8ZIA2pQ4V0wfHZlTxyu CcajXH46AknHaAqcIz5eWrY4CgRiyqW425QwpFSB7bVqmUc+MQoGbfY/d5fs+S5hKjwI +xVw== X-Gm-Message-State: ACgBeo2d8Zq7eix21QrA7gyC2tzC7NOWVIdOhSZa9WfhcuEeY2ydcjuc raPquLYvpX2c7n/Hwilhj/qPTQ== X-Google-Smtp-Source: AA6agR54ITWThcZ1aMJWyfiJTPcW3V/2oO2lUB+mlbei49YQMsWuFF/0qzWnKIbZAOmtqzOxNhdP7g== X-Received: by 2002:a05:651c:2106:b0:26b:ea0d:63e9 with SMTP id a6-20020a05651c210600b0026bea0d63e9mr1284134ljq.414.1662801291706; Sat, 10 Sep 2022 02:14:51 -0700 (PDT) Received: from krzk-bin.. (78-11-189-27.static.ip.netia.com.pl. [78.11.189.27]) by smtp.gmail.com with ESMTPSA id x22-20020a19e016000000b0048b26d4bb64sm201552lfg.40.2022.09.10.02.14.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Sep 2022 02:14:51 -0700 (PDT) From: Krzysztof Kozlowski To: Srinivas Kandagatla , Banajit Goswami , Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Liam Girdwood , Mark Brown , 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 v4 12/15] ASoC: dt-bindings: qcom,q6dsp-lpass-ports: cleanup example Date: Sat, 10 Sep 2022 11:14:25 +0200 Message-Id: <20220910091428.50418-13-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220910091428.50418-1-krzysztof.kozlowski@linaro.org> References: <20220910091428.50418-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Cleanup the example DTS by adding APR and service compatibles, adding typical properties, using proper device node names for services and fixing indentation to 4-spaces. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Srinivas Kandagatla --- Changes since v1: 1. Add few more properties. 2. Adjust indentation (better). --- .../sound/qcom,q6dsp-lpass-ports.yaml | 48 +++++++++++-------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/qcom,q6dsp-lpass-ports.yaml b/Documentation/devicetree/bindings/sound/qcom,q6dsp-lpass-ports.yaml index 5e666d9fb388..e53fc0960a14 100644 --- a/Documentation/devicetree/bindings/sound/qcom,q6dsp-lpass-ports.yaml +++ b/Documentation/devicetree/bindings/sound/qcom,q6dsp-lpass-ports.yaml @@ -153,24 +153,29 @@ examples: #include #include apr { + compatible = "qcom,apr-v2"; #address-cells = <1>; #size-cells = <0>; - apr-service@4 { + qcom,domain = ; + + service@4 { + compatible = "qcom,q6afe"; reg = ; + qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd"; dais { - compatible = "qcom,q6afe-dais"; - #address-cells = <1>; - #size-cells = <0>; - #sound-dai-cells = <1>; - - dai@22 { - reg = ; - qcom,sd-lines = <0 1 2 3>; - }; + compatible = "qcom,q6afe-dais"; + #address-cells = <1>; + #size-cells = <0>; + #sound-dai-cells = <1>; + + dai@22 { + reg = ; + qcom,sd-lines = <0 1 2 3>; + }; }; }; - }; + }; - | #include gpr { @@ -178,20 +183,21 @@ examples: #address-cells = <1>; #size-cells = <0>; qcom,domain = ; + service@1 { compatible = "qcom,q6apm"; reg = ; dais { - compatible = "qcom,q6apm-lpass-dais"; - #address-cells = <1>; - #size-cells = <0>; - #sound-dai-cells = <1>; - - dai@22 { - reg = ; - qcom,sd-lines = <0 1 2 3>; - }; + compatible = "qcom,q6apm-lpass-dais"; + #address-cells = <1>; + #size-cells = <0>; + #sound-dai-cells = <1>; + + dai@22 { + reg = ; + qcom,sd-lines = <0 1 2 3>; + }; }; }; - }; + }; From patchwork Sat Sep 10 09:14:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 604645 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 C37FBC6FA82 for ; Sat, 10 Sep 2022 09:15:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229705AbiIJJPx (ORCPT ); Sat, 10 Sep 2022 05:15:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44852 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229771AbiIJJPL (ORCPT ); Sat, 10 Sep 2022 05:15:11 -0400 Received: from mail-lf1-x133.google.com (mail-lf1-x133.google.com [IPv6:2a00:1450:4864:20::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D886F2F002 for ; Sat, 10 Sep 2022 02:14:54 -0700 (PDT) Received: by mail-lf1-x133.google.com with SMTP id k10so6716065lfm.4 for ; Sat, 10 Sep 2022 02:14:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=aK4G1Qq6cdDpbzIBmLo9qbHlkXgmVXTFgbxmWme4nqM=; b=RTrok220LM/b9Uk07c9RLsnqCOU6qZiUKKpYirj3esRthzT/dRh6M1tnOkAmYszt/5 tBAj5b/x0emE8K6hqwk8VCcmxDdeG5nJfGGW6HgHUc3qq4FkvwAbGY5CzH0uw6r6U3Pg s17rwctZD+1HSp+zle7Yu6oQ1wOnWZqVNOAKOgwsAdr4adCq/kYPS07nPuJbvGSZsn1s SyrVzxDFbLXwlZDLZXeAu5gP7qI0t0AbDB4n/StHpfczrZb91kFGgz/W5fNte11s8c47 dzChcLArJPeKcloinTdTyd4T3e2Y4aJmZ1LxKc9c8IihrxVJ++CmBcitQKaxDCTDg0M8 elUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=aK4G1Qq6cdDpbzIBmLo9qbHlkXgmVXTFgbxmWme4nqM=; b=HQfTBwwejupcyFQY6rGC9KopQGMM9cZgQNyoRWuLKC6m9YsYYNIFRbSR4kCqDN40Q0 hsS78o4jRvXD1clmc8FgN06rgbs1xMHqVJ1zM0MkEBQyQ3aS+cV+xaZagUJy+oXe9n6d boxzbVgn6MLdKFe0LcR4y0MyiQy38dh56/31wwojvVT3gY3OBg2v5QwQ3upVzJP0W94C t5WVrx5PGu8V2osQ4Ca9/Q/1XCAVKwlyp3JBmpisXJYgvQtUr0ojX4RsI2TO8MGzSpUX TjRtlhAwh+Snx5N/Oaou6wKU61Mj1lKT3KN46ErQeHJpMWly01RnxU9ISAVK+6mKEnQs sLIA== X-Gm-Message-State: ACgBeo0czdB6YW4+8IZAISYL/R71hIO3vRHCJuS5lRkJMa+fRrRYQARM i1jZrcCblMY2FBlYlM4D8LeoSA== X-Google-Smtp-Source: AA6agR42Ti+UFet+yPHWp/NC9BjFyAg2Iqnk5J3QWrDLMxCGYye3JpY/bZ52d4m3k49P4vYgqeNkyA== X-Received: by 2002:a05:6512:3d02:b0:498:f4d4:e246 with SMTP id d2-20020a0565123d0200b00498f4d4e246mr3335630lfv.115.1662801292990; Sat, 10 Sep 2022 02:14:52 -0700 (PDT) Received: from krzk-bin.. (78-11-189-27.static.ip.netia.com.pl. [78.11.189.27]) by smtp.gmail.com with ESMTPSA id x22-20020a19e016000000b0048b26d4bb64sm201552lfg.40.2022.09.10.02.14.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Sep 2022 02:14:52 -0700 (PDT) From: Krzysztof Kozlowski To: Srinivas Kandagatla , Banajit Goswami , Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Liam Girdwood , Mark Brown , 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 v4 13/15] ASoC: dt-bindings: qcom, q6dsp-lpass-clocks: cleanup example Date: Sat, 10 Sep 2022 11:14:26 +0200 Message-Id: <20220910091428.50418-14-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220910091428.50418-1-krzysztof.kozlowski@linaro.org> References: <20220910091428.50418-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Cleanup the example DTS by adding APR and service compatibles, adding typical properties, using proper device node names for services and fixing indentation to 4-spaces. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Srinivas Kandagatla Reviewed-by: Rob Herring --- Changes since v1: 1. Add few more properties. 2. Adjust indentation (better). --- .../sound/qcom,q6dsp-lpass-clocks.yaml | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/qcom,q6dsp-lpass-clocks.yaml b/Documentation/devicetree/bindings/sound/qcom,q6dsp-lpass-clocks.yaml index 604861d84ffa..fd567d20417d 100644 --- a/Documentation/devicetree/bindings/sound/qcom,q6dsp-lpass-clocks.yaml +++ b/Documentation/devicetree/bindings/sound/qcom,q6dsp-lpass-clocks.yaml @@ -38,17 +38,22 @@ examples: #include #include apr { + compatible = "qcom,apr-v2"; + qcom,domain = ; #address-cells = <1>; #size-cells = <0>; - apr-service@4 { + + service@4 { + compatible = "qcom,q6afe"; reg = ; + qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd"; clock-controller { - compatible = "qcom,q6afe-clocks"; - #clock-cells = <2>; + compatible = "qcom,q6afe-clocks"; + #clock-cells = <2>; }; }; - }; + }; - | #include @@ -57,13 +62,14 @@ examples: qcom,domain = ; #address-cells = <1>; #size-cells = <0>; + service@2 { reg = ; compatible = "qcom,q6prm"; clock-controller { - compatible = "qcom,q6prm-lpass-clocks"; - #clock-cells = <2>; + compatible = "qcom,q6prm-lpass-clocks"; + #clock-cells = <2>; }; }; - }; + };