| Message ID | 20230102105038.8074-3-johan+linaro@kernel.org |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4106592wrt;
Mon, 2 Jan 2023 02:52:37 -0800 (PST)
X-Google-Smtp-Source:
AMrXdXtqsWt8J4Qm5qyGZVdwviS16rMuIzfW4cQACuXN6fItfdgExode9u+WoDNY7qG+ttdDt8sv
X-Received: by 2002:a05:6a20:a6a7:b0:ad:eaea:e07 with SMTP id
ba39-20020a056a20a6a700b000adeaea0e07mr53246825pzb.10.1672656757440;
Mon, 02 Jan 2023 02:52:37 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1672656757; cv=none;
d=google.com; s=arc-20160816;
b=fFpQLzNpzuZjK7UtHPK0dU7BSivRiVkke/+pQG34dqkDJU7ruen5ima3Dj1/kUkRIF
fnLWh+zQTt6OUzZU3IhfTcyhIZPfmqa44ZX5tiM4t/hW2nYq6HKplr6mBdWWlKjWa//t
qV5Us11ktS9eCUc5FNsmprB2qsS0ElLMWRZUa91q6qsBW8npfTAKKW4y3LDbX/wa9/MF
vzOBHPlJ8WYBUhpINLbpYRDF9xPlCRSePFdNVLBAKSK2z4NqUcNnMRAhBE4vjnOXfyhI
6FCF3k5lnoDY+RGm1TKXnIWtGaMQlBVPadS8tCqUUMoURwnnrCV2iksWqMFuLNxmvWio
qEdA==
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
:references:in-reply-to:message-id:date:subject:cc:to:from
:dkim-signature;
bh=g0dt4wZUOw6ocElFE0V988+tpkoU5awbLjuW+G/rZCg=;
b=i1pOnuhSBAuCNuyJREGURRcZa0ATMg/BRK+GWwhJaTb4KQ6+7z/CUx5KvjskEO8kH0
JAeb/ercp5Rv67DXnVuTU8H+UuCbCCaSOw7qpxIOrXSB6BFL+wg1zmFB677NSmE7WKxf
yuxS3oRzj/X1Etq5FrUvZrGJ9uo19RekDPoll557OOyaHwSreDb5bGP63Gt8e6pJE8r1
pk7Q0U2vD62PRrLCUayyEhLZqU0UCpi5DTepHBaLUfP+pfipbEKbGGAfYzjXp1VO78GD
jo3SJEwvjQzxlmhTQ4bCIjlV/j1FEa2pLp8g7jBHS22sA+eqJeljZsNMDXmg/rqevk/z
8ngQ==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@kernel.org header.s=k20201202 header.b=KogeyiMo;
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=kernel.org
Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20])
by mx.google.com with ESMTP id
x23-20020a63cc17000000b0047702d2fe08si28616888pgf.493.2023.01.02.02.52.24;
Mon, 02 Jan 2023 02:52:37 -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=@kernel.org header.s=k20201202 header.b=KogeyiMo;
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=kernel.org
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S231624AbjABKvi (ORCPT <rfc822;wlfightup@gmail.com> + 99 others);
Mon, 2 Jan 2023 05:51:38 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52422 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S232641AbjABKvM (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Mon, 2 Jan 2023 05:51:12 -0500
Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6A1D662EA;
Mon, 2 Jan 2023 02:50:52 -0800 (PST)
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 01D6A60F24;
Mon, 2 Jan 2023 10:50:52 +0000 (UTC)
Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5B85BC433F0;
Mon, 2 Jan 2023 10:50:51 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
s=k20201202; t=1672656651;
bh=7UX9bOAXVnWRxEDVubLyZtn33Yhbs5rYhhTJqnlC0mY=;
h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
b=KogeyiMofFYXmCceCHNzJjy1BSXMXV2CtlkhgHhPQU6SFAdRGJoZoGIOmzYbWScrk
Zz7OFsCOHdBlNJa3mQQM+IVU5vhcqs/sGUzWZ/oWkw1WaEvik3o4ynZBwvWlC3uTvQ
2NiDpGVLUYiFQjaTX/VjKVBEP8k5bCs8WogfIJVV3+Ft0LMmgt79D/k29aMPq2Q48K
oB2Dl+6TQ8QEbYYW20XKKiozkG2/QAU/G4YjRx9vi8b/1c0og7brrwTnTVEyfAIHSX
OGGyTMnrDeCqpVRS04B2lmmmvpl7Iep/5fa11uLjKc8MdYAJE133oOETulAiiZ3eGB
aev22jqC8q2Fw==
Received: from johan by xi.lan with local (Exim 4.94.2)
(envelope-from <johan+linaro@kernel.org>)
id 1pCIPM-00026s-9I; Mon, 02 Jan 2023 11:51:08 +0100
From: Johan Hovold <johan+linaro@kernel.org>
To: Bjorn Andersson <andersson@kernel.org>
Cc: Andy Gross <agross@kernel.org>,
Konrad Dybcio <konrad.dybcio@linaro.org>,
Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Srinivas Kandagatla <srinivas.kandagatla@linaro.org>,
linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org,
Johan Hovold <johan+linaro@kernel.org>
Subject: [PATCH 2/6] arm64: dts: qcom: sc8280xp: disable sound nodes
Date: Mon, 2 Jan 2023 11:50:34 +0100
Message-Id: <20230102105038.8074-3-johan+linaro@kernel.org>
X-Mailer: git-send-email 2.37.4
In-Reply-To: <20230102105038.8074-1-johan+linaro@kernel.org>
References: <20230102105038.8074-1-johan+linaro@kernel.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI,
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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
X-GMAIL-THRID: =?utf-8?q?1753907732210008676?=
X-GMAIL-MSGID: =?utf-8?q?1753907732210008676?=
|
| Series |
arm64: dts: qcom: disable x13s sound + cleanups
|
|
Commit Message
Johan Hovold
Jan. 2, 2023, 10:50 a.m. UTC
The sound nodes in the SoC dtsi should be disabled by default.
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
---
arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
Comments
On 2.01.2023 11:50, Johan Hovold wrote: > The sound nodes in the SoC dtsi should be disabled by default. > > Signed-off-by: Johan Hovold <johan+linaro@kernel.org> > --- Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> Konrad > arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 16 ++++++++++++++++ > 1 file changed, 16 insertions(+) > > diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi > index ed1e2bee86ee..c1ce2d7b3675 100644 > --- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi > +++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi > @@ -1733,6 +1733,8 @@ rxmacro: rxmacro@3200000 { > > pinctrl-names = "default"; > pinctrl-0 = <&rx_swr_default>; > + > + status = "disabled"; > }; > > /* RX */ > @@ -1760,6 +1762,8 @@ swr1: soundwire-controller@3210000 { > #sound-dai-cells = <1>; > #address-cells = <2>; > #size-cells = <0>; > + > + status = "disabled"; > }; > > txmacro: txmacro@3220000 { > @@ -1783,6 +1787,8 @@ txmacro: txmacro@3220000 { > #address-cells = <2>; > #size-cells = <2>; > #sound-dai-cells = <1>; > + > + status = "disabled"; > }; > > wsamacro: codec@3240000 { > @@ -1804,6 +1810,8 @@ wsamacro: codec@3240000 { > > pinctrl-names = "default"; > pinctrl-0 = <&wsa_swr_default>; > + > + status = "disabled"; > }; > > /* WSA */ > @@ -1830,6 +1838,8 @@ swr0: soundwire-controller@3250000 { > #sound-dai-cells = <1>; > #address-cells = <2>; > #size-cells = <0>; > + > + status = "disabled"; > }; > > /* TX */ > @@ -1858,6 +1868,8 @@ swr2: soundwire-controller@3330000 { > qcom,ports-word-length = /bits/ 8 <0xff 0x00 0xff 0xff>; > qcom,ports-block-group-count = /bits/ 8 <0xff 0xff 0xff 0xff>; > qcom,ports-lane-control = /bits/ 8 <0x00 0x01 0x00 0x00>; > + > + status = "disabled"; > }; > > vamacro: codec@3370000 { > @@ -1874,6 +1886,8 @@ vamacro: codec@3370000 { > #clock-cells = <0>; > clock-output-names = "fsgen"; > #sound-dai-cells = <1>; > + > + status = "disabled"; > }; > > lpass_tlmm: pinctrl@33c0000 { > @@ -1888,6 +1902,8 @@ lpass_tlmm: pinctrl@33c0000 { > <&q6prmcc LPASS_HW_DCODEC_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>; > clock-names = "core", "audio"; > > + status = "disabled"; > + > tx_swr_default: tx-swr-default-state { > clk-pins { > pins = "gpio0";
On 02/01/2023 11:50, Johan Hovold wrote: > The sound nodes in the SoC dtsi should be disabled by default. > > Signed-off-by: Johan Hovold <johan+linaro@kernel.org> > --- > arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 16 ++++++++++++++++ > 1 file changed, 16 insertions(+) > > diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi > index ed1e2bee86ee..c1ce2d7b3675 100644 > --- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi > +++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi > @@ -1733,6 +1733,8 @@ rxmacro: rxmacro@3200000 { > > pinctrl-names = "default"; > pinctrl-0 = <&rx_swr_default>; > + > + status = "disabled"; There is no reason this should be disabled by default. No external (per board) configuration is needed and by default SoC components should be enabled if they do not need anything from the board. > }; > > /* RX */ > @@ -1760,6 +1762,8 @@ swr1: soundwire-controller@3210000 { > #sound-dai-cells = <1>; > #address-cells = <2>; > #size-cells = <0>; > + > + status = "disabled"; For soundwires disabling makes sense - these are busses so they need to be explicitly enabled and populated with children. > }; > > txmacro: txmacro@3220000 { > @@ -1783,6 +1787,8 @@ txmacro: txmacro@3220000 { > #address-cells = <2>; > #size-cells = <2>; > #sound-dai-cells = <1>; > + > + status = "disabled"; > }; > > wsamacro: codec@3240000 { > @@ -1804,6 +1810,8 @@ wsamacro: codec@3240000 { > > pinctrl-names = "default"; > pinctrl-0 = <&wsa_swr_default>; > + > + status = "disabled"; > }; > > /* WSA */ > @@ -1830,6 +1838,8 @@ swr0: soundwire-controller@3250000 { > #sound-dai-cells = <1>; > #address-cells = <2>; > #size-cells = <0>; > + > + status = "disabled"; > }; > > /* TX */ > @@ -1858,6 +1868,8 @@ swr2: soundwire-controller@3330000 { > qcom,ports-word-length = /bits/ 8 <0xff 0x00 0xff 0xff>; > qcom,ports-block-group-count = /bits/ 8 <0xff 0xff 0xff 0xff>; > qcom,ports-lane-control = /bits/ 8 <0x00 0x01 0x00 0x00>; > + > + status = "disabled"; > }; > > vamacro: codec@3370000 { > @@ -1874,6 +1886,8 @@ vamacro: codec@3370000 { > #clock-cells = <0>; > clock-output-names = "fsgen"; > #sound-dai-cells = <1>; > + > + status = "disabled"; vamacro needs supply from the board so this one also makes sense. Best regards, Krzysztof
On Mon, Jan 02, 2023 at 01:29:38PM +0100, Krzysztof Kozlowski wrote: > On 02/01/2023 11:50, Johan Hovold wrote: > > The sound nodes in the SoC dtsi should be disabled by default. > > > > Signed-off-by: Johan Hovold <johan+linaro@kernel.org> > > --- > > arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 16 ++++++++++++++++ > > 1 file changed, 16 insertions(+) > > > > diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi > > index ed1e2bee86ee..c1ce2d7b3675 100644 > > --- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi > > +++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi > > @@ -1733,6 +1733,8 @@ rxmacro: rxmacro@3200000 { > > > > pinctrl-names = "default"; > > pinctrl-0 = <&rx_swr_default>; > > + > > + status = "disabled"; > > There is no reason this should be disabled by default. No external (per > board) configuration is needed and by default SoC components should be > enabled if they do not need anything from the board. This node is one of the nodes for which driver support is not yet in place so that's one reason for at least disabling it temporarily. Since all other pinconfig lives in the board dts, if we decide to move also the sound pinconfig then then that may be a second. Johan
On Mon, Jan 02, 2023 at 04:15:42PM +0100, Johan Hovold wrote: > On Mon, Jan 02, 2023 at 01:29:38PM +0100, Krzysztof Kozlowski wrote: > > On 02/01/2023 11:50, Johan Hovold wrote: > > > The sound nodes in the SoC dtsi should be disabled by default. > > > > > > Signed-off-by: Johan Hovold <johan+linaro@kernel.org> > > > --- > > > arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 16 ++++++++++++++++ > > > 1 file changed, 16 insertions(+) > > > > > > diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi > > > index ed1e2bee86ee..c1ce2d7b3675 100644 > > > --- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi > > > +++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi > > > @@ -1733,6 +1733,8 @@ rxmacro: rxmacro@3200000 { > > > > > > pinctrl-names = "default"; > > > pinctrl-0 = <&rx_swr_default>; > > > + > > > + status = "disabled"; > > > > There is no reason this should be disabled by default. No external (per > > board) configuration is needed and by default SoC components should be > > enabled if they do not need anything from the board. > > This node is one of the nodes for which driver support is not yet in > place so that's one reason for at least disabling it temporarily. > > Since all other pinconfig lives in the board dts, if we decide to move > also the sound pinconfig then then that may be a second. Also note that these depend on q6prmcc which is in turn depends on remoteproc_adsp being enabled by the x13s dts. So keeping them disabled by default seems justified. Johan
On 2.01.2023 18:17, Johan Hovold wrote: > On Mon, Jan 02, 2023 at 04:15:42PM +0100, Johan Hovold wrote: >> On Mon, Jan 02, 2023 at 01:29:38PM +0100, Krzysztof Kozlowski wrote: >>> On 02/01/2023 11:50, Johan Hovold wrote: >>>> The sound nodes in the SoC dtsi should be disabled by default. >>>> >>>> Signed-off-by: Johan Hovold <johan+linaro@kernel.org> >>>> --- >>>> arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 16 ++++++++++++++++ >>>> 1 file changed, 16 insertions(+) >>>> >>>> diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi >>>> index ed1e2bee86ee..c1ce2d7b3675 100644 >>>> --- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi >>>> +++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi >>>> @@ -1733,6 +1733,8 @@ rxmacro: rxmacro@3200000 { >>>> >>>> pinctrl-names = "default"; >>>> pinctrl-0 = <&rx_swr_default>; >>>> + >>>> + status = "disabled"; >>> >>> There is no reason this should be disabled by default. No external (per >>> board) configuration is needed and by default SoC components should be >>> enabled if they do not need anything from the board. >> >> This node is one of the nodes for which driver support is not yet in >> place so that's one reason for at least disabling it temporarily. >> >> Since all other pinconfig lives in the board dts, if we decide to move >> also the sound pinconfig then then that may be a second. > > Also note that these depend on q6prmcc which is in turn depends on > remoteproc_adsp being enabled by the x13s dts. > > So keeping them disabled by default seems justified. This I agree with, having sound-related nodes enabled by default results in a big chunk of "deferred probe pending" spam when you boot with adsp disabled (for example when you don't have fw for your board in your rootfs).. Konrad > > Johan
diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi index ed1e2bee86ee..c1ce2d7b3675 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi +++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi @@ -1733,6 +1733,8 @@ rxmacro: rxmacro@3200000 { pinctrl-names = "default"; pinctrl-0 = <&rx_swr_default>; + + status = "disabled"; }; /* RX */ @@ -1760,6 +1762,8 @@ swr1: soundwire-controller@3210000 { #sound-dai-cells = <1>; #address-cells = <2>; #size-cells = <0>; + + status = "disabled"; }; txmacro: txmacro@3220000 { @@ -1783,6 +1787,8 @@ txmacro: txmacro@3220000 { #address-cells = <2>; #size-cells = <2>; #sound-dai-cells = <1>; + + status = "disabled"; }; wsamacro: codec@3240000 { @@ -1804,6 +1810,8 @@ wsamacro: codec@3240000 { pinctrl-names = "default"; pinctrl-0 = <&wsa_swr_default>; + + status = "disabled"; }; /* WSA */ @@ -1830,6 +1838,8 @@ swr0: soundwire-controller@3250000 { #sound-dai-cells = <1>; #address-cells = <2>; #size-cells = <0>; + + status = "disabled"; }; /* TX */ @@ -1858,6 +1868,8 @@ swr2: soundwire-controller@3330000 { qcom,ports-word-length = /bits/ 8 <0xff 0x00 0xff 0xff>; qcom,ports-block-group-count = /bits/ 8 <0xff 0xff 0xff 0xff>; qcom,ports-lane-control = /bits/ 8 <0x00 0x01 0x00 0x00>; + + status = "disabled"; }; vamacro: codec@3370000 { @@ -1874,6 +1886,8 @@ vamacro: codec@3370000 { #clock-cells = <0>; clock-output-names = "fsgen"; #sound-dai-cells = <1>; + + status = "disabled"; }; lpass_tlmm: pinctrl@33c0000 { @@ -1888,6 +1902,8 @@ lpass_tlmm: pinctrl@33c0000 { <&q6prmcc LPASS_HW_DCODEC_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>; clock-names = "core", "audio"; + status = "disabled"; + tx_swr_default: tx-swr-default-state { clk-pins { pins = "gpio0";