From patchwork Mon Mar 28 14:30:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinod Koul X-Patchwork-Id: 554857 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 560AEC433EF for ; Mon, 28 Mar 2022 14:30:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243864AbiC1Ocb (ORCPT ); Mon, 28 Mar 2022 10:32:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35824 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243861AbiC1Oca (ORCPT ); Mon, 28 Mar 2022 10:32:30 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 20870434B8; Mon, 28 Mar 2022 07:30:50 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id C1FC6B80E72; Mon, 28 Mar 2022 14:30:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 16AA8C3410F; Mon, 28 Mar 2022 14:30:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1648477847; bh=SRl95RjWY1dF6XaJGOl9tSAZZMHAcJr32gLMJM8D2Qs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KuYcpv4K0ESi2O7521ZxfZY0sKrHBynbr6lRyV8vpazrAo5utgoAXId+VjPFckE1y OsUDQK4Re3r6oi5BJQWX7JEE4PHM/KSRUmlNoydx0pnWn76dsWW7EM/uCa9fnbgF8T EmYGoIbpEf2CTZV793N1MIukMENdP0px/6ahE02o5Lqipp01huFAHKfD4HSuzHdC6J rr+HBJ9rCl02vdr7+irxQ13VaHrmNTOnGRJSgKZs8UFM6LTVHTWsF6AlvutkwqgSRE 8IjUtGARI/Ose9uPAoAWcKuZ841HKpVuYXckYAmVXOPJd2fvlgn5sRIYE6Fxt+Fl80 cbGyn51729Vyw== From: Vinod Koul To: Bjorn Andersson Cc: linux-arm-msm@vger.kernel.org, Vinod Koul , Rob Herring , Andy Gross , Krzysztof Kozlowski , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/6] arm64: dts: qcom: sm8450: rename interconnect nodes Date: Mon, 28 Mar 2022 20:00:30 +0530 Message-Id: <20220328143035.519909-2-vkoul@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220328143035.519909-1-vkoul@kernel.org> References: <20220328143035.519909-1-vkoul@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org clk-virt and mc-virt interconnect nodes were named interconnect@0 and interconnect@1. That is incorrect as we don't have unit addresses 0/1 for these node. This causes warning: arch/arm64/boot/dts/qcom/sm8450.dtsi:255.27-259.4: Warning (unit_address_vs_reg): /interconnect@0: node has a unit name, but no reg or ranges property arch/arm64/boot/dts/qcom/sm8450.dtsi:261.26-265.4: Warning (unit_address_vs_reg): /interconnect@1: node has a unit name, but no reg or ranges property arch/arm64/boot/dts/qcom/sm8450.dtsi:255.27-259.4: Warning (unique_unit_address_if_enabled): /interconnect@0: duplicate unit-address (also used in node /soc@0) Rename the nodes to interconnect-0 and interconnect-1 to fix the warning. Signed-off-by: Vinod Koul Suggested-by: Krzysztof Kozlowski --- arch/arm64/boot/dts/qcom/sm8450.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm8450.dtsi b/arch/arm64/boot/dts/qcom/sm8450.dtsi index 934e29b9e153..b0128d115e7a 100644 --- a/arch/arm64/boot/dts/qcom/sm8450.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8450.dtsi @@ -252,13 +252,13 @@ scm: scm { }; }; - clk_virt: interconnect@0 { + clk_virt: interconnect-0 { compatible = "qcom,sm8450-clk-virt"; #interconnect-cells = <2>; qcom,bcm-voters = <&apps_bcm_voter>; }; - mc_virt: interconnect@1 { + mc_virt: interconnect-1 { compatible = "qcom,sm8450-mc-virt"; #interconnect-cells = <2>; qcom,bcm-voters = <&apps_bcm_voter>; From patchwork Mon Mar 28 14:30:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinod Koul X-Patchwork-Id: 554856 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 BB761C433F5 for ; Mon, 28 Mar 2022 14:31:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243880AbiC1Ocm (ORCPT ); Mon, 28 Mar 2022 10:32:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36424 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243895AbiC1Oci (ORCPT ); Mon, 28 Mar 2022 10:32:38 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5D87343AD1; Mon, 28 Mar 2022 07:30:56 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 13C84B80E72; Mon, 28 Mar 2022 14:30:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3AEA3C34111; Mon, 28 Mar 2022 14:30:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1648477853; bh=jU5fTmunGGnC6lg6eTG9ET0TEidj2lyYESe/UhhpeyU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZdPwqDwlNXVOu/9uy/RIqXntzFR4QKlmbqhil5aUICYe7E7K9vlrqr0JHiWsLZNxP gA5iQylzDBLQ1IjtKcOb55x8drpLI43obqORFFmiW8FfdlCKIbEyBWoTXv43vJVK9C BhjNy3CL2NFldi05016nHu3bI9OTJHNQ+lKKR/5k9ew5H54SNxH5vRFsoGeMUQPiEo 0zvSh/VFSBVP9UIA7uJ71F6DqnGYRTIUOR3rNB3SUfEPcG7wZLNHtg9EOKVBAo0ynl /JR3lAGjHB1CLApw4st+rhqAXH7QUJ9iy7ZtDg6iy45wR1NVVJniP/XhDxGGuO0sIw rFFyY7PejW51A== From: Vinod Koul To: Bjorn Andersson Cc: linux-arm-msm@vger.kernel.org, Vinod Koul , Rob Herring , Andy Gross , Krzysztof Kozlowski , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/6] arm64: dts: qcom: sm8250: move qup-opp-table out of soc node Date: Mon, 28 Mar 2022 20:00:32 +0530 Message-Id: <20220328143035.519909-4-vkoul@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220328143035.519909-1-vkoul@kernel.org> References: <20220328143035.519909-1-vkoul@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The soc node expects all the nodes to have unit addresses. The qup-opp-table does not have that which causes warnings: arch/arm64/boot/dts/qcom/sm8250.dtsi:916.32-933.5: Warning (simple_bus_reg): /soc@0/qup-opp-table: missing or empty reg/ranges property Move the qup-opp-table out of soc node to fix these warnings Signed-off-by: Vinod Koul --- arch/arm64/boot/dts/qcom/sm8250.dtsi | 38 ++++++++++++++-------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi index fdaf303ba047..b120babdb26c 100644 --- a/arch/arm64/boot/dts/qcom/sm8250.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi @@ -701,6 +701,25 @@ CLUSTER_PD: cpu-cluster0 { }; }; + qup_opp_table: qup-opp-table { + compatible = "operating-points-v2"; + + opp-50000000 { + opp-hz = /bits/ 64 <50000000>; + required-opps = <&rpmhpd_opp_min_svs>; + }; + + opp-75000000 { + opp-hz = /bits/ 64 <75000000>; + required-opps = <&rpmhpd_opp_low_svs>; + }; + + opp-120000000 { + opp-hz = /bits/ 64 <120000000>; + required-opps = <&rpmhpd_opp_svs>; + }; + }; + reserved-memory { #address-cells = <2>; #size-cells = <2>; @@ -913,25 +932,6 @@ rng: rng@793000 { clock-names = "core"; }; - qup_opp_table: qup-opp-table { - compatible = "operating-points-v2"; - - opp-50000000 { - opp-hz = /bits/ 64 <50000000>; - required-opps = <&rpmhpd_opp_min_svs>; - }; - - opp-75000000 { - opp-hz = /bits/ 64 <75000000>; - required-opps = <&rpmhpd_opp_low_svs>; - }; - - opp-120000000 { - opp-hz = /bits/ 64 <120000000>; - required-opps = <&rpmhpd_opp_svs>; - }; - }; - gpi_dma2: dma-controller@800000 { compatible = "qcom,sm8250-gpi-dma"; reg = <0 0x00800000 0 0x70000>; From patchwork Mon Mar 28 14:30:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinod Koul X-Patchwork-Id: 554855 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 DDEB8C433F5 for ; Mon, 28 Mar 2022 14:31:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243869AbiC1OdL (ORCPT ); Mon, 28 Mar 2022 10:33:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36916 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243918AbiC1Ocn (ORCPT ); Mon, 28 Mar 2022 10:32:43 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6580444777; Mon, 28 Mar 2022 07:31:00 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 6D77B61243; Mon, 28 Mar 2022 14:31:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5E7B0C34111; Mon, 28 Mar 2022 14:30:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1648477859; bh=OuRo2q+coWtb/ALyqpyfzlvv3DncSmX5J0Wv6DnCo6M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fdAnRGpsJ6xFyxaB/YI7OPLUwBkCWAtSSiNXB+HrQ+WkY68iJ3m/95U/3czpJKRc8 ZWm+wLa9q55CE55KiLrHfabf0UflBdQ36post17Rz0rZKGWYqwgnvnWzOXCEN0F/c1 exWVaYdel9ANnvERwEysnRHSCDaCUm3YUc6qpUk+qyp7kZY59BBvDGIQKgA22wlora jMxovM4jmcnhHxKSAuuZPka94WYAOk22TUBK74oLBI6YDLNtq8GvG56Rexoq29FSJI 68QWLr8Kyo7OZXCKDPiQ4CDIOl99RtYTY9wTiAPyLzVZSWBEFyvaFQiG2bBegbcyUP aRW9qDeuM3vVw== From: Vinod Koul To: Bjorn Andersson Cc: linux-arm-msm@vger.kernel.org, Vinod Koul , Rob Herring , Andy Gross , Krzysztof Kozlowski , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/6] arm64: dts: qcom: sm8250: move wcd938x node out of soc node Date: Mon, 28 Mar 2022 20:00:34 +0530 Message-Id: <20220328143035.519909-6-vkoul@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220328143035.519909-1-vkoul@kernel.org> References: <20220328143035.519909-1-vkoul@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The soc node expects all the nodes to have unit addresses. The wcd codec node does not have that which causes warnings: arch/arm64/boot/dts/qcom/sm8250-mtp.dts:631.17-648.4: Warning (simple_bus_reg): /soc@0/codec: missing or empty reg/ranges property Move wcd node out of soc to fix this Signed-off-by: Vinod Koul --- arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 40 ++++++++++++------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm8250-mtp.dts b/arch/arm64/boot/dts/qcom/sm8250-mtp.dts index fb99cc2827c7..3876a94b49a9 100644 --- a/arch/arm64/boot/dts/qcom/sm8250-mtp.dts +++ b/arch/arm64/boot/dts/qcom/sm8250-mtp.dts @@ -156,6 +156,25 @@ vreg_s6c_0p88: smpc6-regulator { regulator-always-on; vin-supply = <&vph_pwr>; }; + + wcd938x: codec { + compatible = "qcom,wcd9380-codec"; + #sound-dai-cells = <1>; + reset-gpios = <&tlmm 32 0>; + vdd-buck-supply = <&vreg_s4a_1p8>; + vdd-rxtx-supply = <&vreg_s4a_1p8>; + vdd-io-supply = <&vreg_s4a_1p8>; + vdd-mic-bias-supply = <&vreg_bob>; + qcom,micbias1-microvolt = <1800000>; + qcom,micbias2-microvolt = <1800000>; + qcom,micbias3-microvolt = <1800000>; + qcom,micbias4-microvolt = <1800000>; + qcom,mbhc-buttons-vthreshold-microvolt = <75000 150000 237000 500000 500000 500000 500000 500000>; + qcom,mbhc-headset-vthreshold-microvolt = <1700000>; + qcom,mbhc-headphone-vthreshold-microvolt = <50000>; + qcom,rx-device = <&wcd_rx>; + qcom,tx-device = <&wcd_tx>; + }; }; &adsp { @@ -627,27 +646,6 @@ &slpi { firmware-name = "qcom/sm8250/slpi.mbn"; }; -&soc { - wcd938x: codec { - compatible = "qcom,wcd9380-codec"; - #sound-dai-cells = <1>; - reset-gpios = <&tlmm 32 0>; - vdd-buck-supply = <&vreg_s4a_1p8>; - vdd-rxtx-supply = <&vreg_s4a_1p8>; - vdd-io-supply = <&vreg_s4a_1p8>; - vdd-mic-bias-supply = <&vreg_bob>; - qcom,micbias1-microvolt = <1800000>; - qcom,micbias2-microvolt = <1800000>; - qcom,micbias3-microvolt = <1800000>; - qcom,micbias4-microvolt = <1800000>; - qcom,mbhc-buttons-vthreshold-microvolt = <75000 150000 237000 500000 500000 500000 500000 500000>; - qcom,mbhc-headset-vthreshold-microvolt = <1700000>; - qcom,mbhc-headphone-vthreshold-microvolt = <50000>; - qcom,rx-device = <&wcd_rx>; - qcom,tx-device = <&wcd_tx>; - }; -}; - &sound { compatible = "qcom,sm8250-sndcard"; model = "SM8250-MTP-WCD9380-WSA8810-VA-DMIC";