From patchwork Tue Jan 3 10:31:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 38360 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4541753wrt; Tue, 3 Jan 2023 02:32:44 -0800 (PST) X-Google-Smtp-Source: AMrXdXvAHl7RULg2ShZP4n/xgY5Lms4DJP46gPH418TrW6sXew1XOHwRQa9yy0ov0zhe81yQ7Caf X-Received: by 2002:aa7:d445:0:b0:482:ab74:643a with SMTP id q5-20020aa7d445000000b00482ab74643amr28106788edr.22.1672741964406; Tue, 03 Jan 2023 02:32:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672741964; cv=none; d=google.com; s=arc-20160816; b=ZaN5MFgozvBA5bWxI8RMSKhbLykf6FMh8tGoyjjdeh7JkQzBIQhAoEiEYnts+BEgCm NLAJGD95vwUK3K6kM+kle61tlN+9b5c33tqc9i+ZTK5rANMsJQrCdZAGK8FD8bQq+hAy bMSBY8M0KyZn8ANlJBLAvLiht/0gMjEsWGa/u1H2ZCOkhuD8+KoksxH/2NEBmt0fYetD 4mSYJqQpMBFTJ1e9ztmFgx7pFoL//kBfCeiV8DnyMWuoLwDlR6l+EltxRNx3Ws8LlipY WKRQ7nwNYaeg8gCiqzyTGfu7NFkflHczApTZ/egEqVeaRsCtFEi9QKqH9znSq6iu1V72 JmXg== 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=GLCkeRfKPL6ENIc0jXeqqJpbVBNyIvzrmr2cCqRfOqo=; b=H8gtqEd0rsQm87+UQqC9tlNCcp04gpcx8sJr0JbYRVSwjJ9ejm0AUym6UfJnmqhG5P P+9zU4FTSf4HUdGRJa3TA42OXkk5mo6GgYsRqWcOsIUHsda1LSgMB2jGEJMkqA3oC978 g11qoTG2E2o+RXnI7SmDnXFqSHlGLmEWp+6H1HMgL9UAqdxuaDFW44FnEfF+zJMvtBvF RyQdGS3/7bOLL1qncTgBTrfaHAT5dzs/O8W/F3lUCKf+byPC1MJLbHVnNelgXSVHxuzi inGz9JjYb52aXZOB5c+4crwg5iuoch7QcX7I1lvdQT29Dw6V7mRjECYI0rN5TBm7j6Jn MBtg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=nrIoUMGf; 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 h25-20020aa7c619000000b00489e993b8easi11532393edq.630.2023.01.03.02.32.21; Tue, 03 Jan 2023 02:32:44 -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=nrIoUMGf; 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 S236969AbjACKbm (ORCPT + 99 others); Tue, 3 Jan 2023 05:31:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55988 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236883AbjACKbh (ORCPT ); Tue, 3 Jan 2023 05:31:37 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0B119FAC9; Tue, 3 Jan 2023 02:31:37 -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 9D86261240; Tue, 3 Jan 2023 10:31:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 05280C433F0; Tue, 3 Jan 2023 10:31:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672741896; bh=fBcINO4pbQqHnHN2BMS9j/GMWiUMhxzbCstdsbR92es=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nrIoUMGfwaofHcudHPLmMKVC5yt+lyFENN2I+CxBJgpEWPUKenS+hYos8LufGyWx/ Ey90+7psT2Ort9N4lLRvjEHkSWvTVRemP0LRWrR3oNjxjdkQEbzY+vJ/YWEEV6IGJL 1+o8vqb87gS4krJbgr7CRRFiFzHx/0SHlbB4WWO5W5x2CiSwOA/5pR6JDqu7wuyKcO t3vhaWBqgTJJ+a3rl3wG8N8XnuUQEIGxCNG33J/4xueggoYk94K3vBlJrhaqj/gUiH ww5sTnfwZatte2Bd0F51Pg7694Q6IMKRhGbYust9QFou0n3fRNdpKxaYtg1LeyOMGM SsXAZZzt+WJtg== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1pCeaJ-00047O-Ki; Tue, 03 Jan 2023 11:31:55 +0100 From: Johan Hovold To: Bjorn Andersson Cc: Andy Gross , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Srinivas Kandagatla , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH v2 1/6] arm64: dts: qcom: sc8280xp: disable sound nodes Date: Tue, 3 Jan 2023 11:31:36 +0100 Message-Id: <20230103103141.15807-2-johan+linaro@kernel.org> X-Mailer: git-send-email 2.37.4 In-Reply-To: <20230103103141.15807-1-johan+linaro@kernel.org> References: <20230103103141.15807-1-johan+linaro@kernel.org> MIME-Version: 1.0 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1753997078207672724?= X-GMAIL-MSGID: =?utf-8?q?1753997078207672724?= The sound nodes in the SoC dtsi should be disabled by default. Note that the lpass-tlmm and macro blocks depend on having the board dts enable the adsp and specifying an appropriate firmware to enable the q6prm clock controller. Reviewed-by: Konrad Dybcio Signed-off-by: Johan Hovold --- .../qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 20 +++++++++++++++++++ arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 16 +++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts index 0201c6776746..f30ede5839b2 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts +++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts @@ -628,6 +628,10 @@ &remoteproc_nsp0 { status = "okay"; }; +&rxmacro { + status = "okay"; +}; + &soc { wcd938x: codec { compatible = "qcom,wcd9380-codec"; @@ -731,6 +735,8 @@ codec { }; &swr0 { + status = "okay"; + left_spkr: wsa8830-left@0,1 { compatible = "sdw10217020200"; reg = <0 1>; @@ -776,11 +782,17 @@ wcd_tx: wcd9380-tx@0,3 { }; }; +&txmacro { + status = "okay"; +}; + &vamacro { pinctrl-0 = <&dmic01_default>, <&dmic02_default>; pinctrl-names = "default"; vdd-micb-supply = <&vreg_s10b>; qcom,dmic-sample-rate = <600000>; + + status = "okay"; }; &usb_0 { @@ -831,12 +843,20 @@ &usb_1_qmpphy { status = "okay"; }; +&wsamacro { + status = "okay"; +}; + &xo_board_clk { clock-frequency = <38400000>; }; /* PINCTRL */ +&lpass_tlmm { + status = "okay"; +}; + &pmc8280_1_gpios { edp_bl_en: edp-bl-en-state { pins = "gpio8"; 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"; From patchwork Tue Jan 3 10:31:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 38366 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4542592wrt; Tue, 3 Jan 2023 02:35:16 -0800 (PST) X-Google-Smtp-Source: AMrXdXveYQ3fjmxUeVq/tk2a3QBsCmr8br1jHcT+JGk0Dzv5f+ft1M936kBqe2YHfKbTnmGrVo5F X-Received: by 2002:a17:906:311b:b0:7c1:64dc:ac25 with SMTP id 27-20020a170906311b00b007c164dcac25mr36868610ejx.23.1672742115917; Tue, 03 Jan 2023 02:35:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672742115; cv=none; d=google.com; s=arc-20160816; b=QRCUMH99hMZcuB3OksU9xDtdS9N4NGZJutC1O0Qs64zvSXC1ggetQI656eI0Oj0Q8D q3jl/FGGG1oie0na/Q+IlUrmqG511hFS5xnUPWM7kqM+3WrwwHQRZ1BCYUVgJ3gdo0E0 bFwDtMKF1n3cx4GUgaTbkAMzh6PebKGB9bF5fi79DbFc10V6XdCppIFK1vmD+JD98qPY e7NzbfXVwiN0Mq11LgA0ir6CgoY4LbYrAvLv5FHMLij4zrlF9JHU35tV/QXen55m04aK sEuLm8z5q+ptaK6FnkjrYCXPx5n1DhME/be4k0llJe2jZsw9BsDXIzR0H4P5fp04HxtA JM5Q== 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=jEG0XGjsJeX8WtTNcBHsamTHupGPnwCrc0EK3CjArps=; b=wptFIOp9irZuHoslthokPvvn21blKB4i8/JyJtSGeIcImhwIstzJCx+/T7RVkexunx eoRT9e1AADBEywhEElLKIUdNoyA38sDnWvuZocYg5J0zw/0Yiw6SwyChKgIUvWp5FEn4 GZ47gQxVI3Zz/CCi0t41O3iLxxe8WUiOEr/o6Xj/UwMxfbK5VEEkLlJKAXKcakZ1wjV3 dJJgfMf3PPO3kn2NcktEAzlLHSE+jh58c3VGi0b69G88XxfgrBtnJmgC4YtiCRrLcETI O6gedbuw+b1VbvvV6tcxCr2pBUKD+8YD6HrixCadC2Pf9XTZVFzCJ1xhibxGdD2Q09qx +Ywg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=qzMqjBUa; 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 f22-20020a0564021e9600b0046b953601c9si31816458edf.7.2023.01.03.02.34.49; Tue, 03 Jan 2023 02:35:15 -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=qzMqjBUa; 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 S237235AbjACKb6 (ORCPT + 99 others); Tue, 3 Jan 2023 05:31:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56132 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237154AbjACKbk (ORCPT ); Tue, 3 Jan 2023 05:31:40 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DA760FADC; Tue, 3 Jan 2023 02:31:38 -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 ams.source.kernel.org (Postfix) with ESMTPS id 7DCCBB80E93; Tue, 3 Jan 2023 10:31:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 17FBAC433EF; Tue, 3 Jan 2023 10:31:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672741896; bh=graVB///psDn1oRsCpA22LhRBM1JsZjpZzIHi9wCaeE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qzMqjBUap4HTNzGDqNvUDdujNf6jwSu8yj1GMsRvctN1CgT3vCZIDr2acyJ8eUPDD pzh0op+z0CmBsxYSHUgD6My62EdVZuHH3tdwxRfWkPQrOSEgqqH4VrxW6sjcaEJ1HV rRn3dHrxe46YVpWl7QQ1IfmL+xexdZ6gEbzfVlvSQkNruKJgBi6jn+p/JuRBcDHY2B qcmdbiJZBjt2ji6haHt2VGq1D/56X7XzlZ01m0JGJQ4solOfjRs5w3xG3qrB5I8OXB XTPFkGSmtqyUZnuQXm0WxmJtUSmUd3wjp/YCcCUZh4DjoGN1TtqXYtdl3sYfMdjmn2 P3c6pNw2Tcwpw== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1pCeaJ-00047Q-Na; Tue, 03 Jan 2023 11:31:55 +0100 From: Johan Hovold To: Bjorn Andersson Cc: Andy Gross , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Srinivas Kandagatla , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH v2 2/6] arm64: dts: qcom: sc8280xp-x13s: move vamacro node Date: Tue, 3 Jan 2023 11:31:37 +0100 Message-Id: <20230103103141.15807-3-johan+linaro@kernel.org> X-Mailer: git-send-email 2.37.4 In-Reply-To: <20230103103141.15807-1-johan+linaro@kernel.org> References: <20230103103141.15807-1-johan+linaro@kernel.org> MIME-Version: 1.0 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1753997237021269059?= X-GMAIL-MSGID: =?utf-8?q?1753997237021269059?= Move the vamacro node to restore the alphabetical sort order. While at it, add some newline separators to improve readability. Signed-off-by: Johan Hovold Reviewed-by: Konrad Dybcio --- .../qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts index f30ede5839b2..cc67a80758af 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts +++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts @@ -786,15 +786,6 @@ &txmacro { status = "okay"; }; -&vamacro { - pinctrl-0 = <&dmic01_default>, <&dmic02_default>; - pinctrl-names = "default"; - vdd-micb-supply = <&vreg_s10b>; - qcom,dmic-sample-rate = <600000>; - - status = "okay"; -}; - &usb_0 { status = "okay"; }; @@ -843,6 +834,17 @@ &usb_1_qmpphy { status = "okay"; }; +&vamacro { + pinctrl-0 = <&dmic01_default>, <&dmic02_default>; + pinctrl-names = "default"; + + vdd-micb-supply = <&vreg_s10b>; + + qcom,dmic-sample-rate = <600000>; + + status = "okay"; +}; + &wsamacro { status = "okay"; }; From patchwork Tue Jan 3 10:31:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 38364 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4542347wrt; Tue, 3 Jan 2023 02:34:36 -0800 (PST) X-Google-Smtp-Source: AMrXdXuQcSkTB/aMpu1L5ybpyXmfegXztAAbcyAypB9UEaeBccvcVpaDwphlbvD+kiuMIuL1XFXX X-Received: by 2002:a50:d616:0:b0:47c:6ed2:43d1 with SMTP id x22-20020a50d616000000b0047c6ed243d1mr40145677edi.30.1672742076070; Tue, 03 Jan 2023 02:34:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672742076; cv=none; d=google.com; s=arc-20160816; b=zm9Tr2jRfR8belyEnfq0WMtvWyOPVGUDILP+Cb3x+Vi75PmKaH/HZK7Cn0oIL4df23 jFsBvASpv2xhd4dhYFsVbnnihfWrgShSSEOtr+Glk5YYiuP4uN9rmkDOWvLxPJaZMdLh o2kpUWV8J5o4DtmykWd+sfBT0ePLtgW5P9yYot+TlKJlRV2phrjr8CId4CDJQPMMEDWN RQXfQ5fS8LkJiPCX/+ZnnupS2LI9ZUoxVI8eB/6U6sRi9e9aMpPJEjlriuSTUeMxdVRE k+VSG2aUgWbZ4vDDwjHAUmXKzBAS1IbRqLrw3NXEJlBEwR5xMv2uWhpI8cUCJSb61548 gdQA== 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=QEB1mNo3j9lWtQ8XMMYzz6eFQXcCujGvOB0VL871vLI=; b=RwJ3JziKEo4G+/dpvZN56Is7TlU5sli7zE7eX5w4Da3YM33Adb87cdVUidtWmZ7tXV xgjCPIamkqhVzZPCFNKvhOj/vHe7ScsJefyV5Tuw96a0NXSkpLF7OE68oz0Xzblva+V7 jWQ7LpVN0/k9mK/vpIsKaBb5DiSb6aBWYVAOuaRGXP8E+XPX+YnZjNeBDRpq5YLri2Gz OwXKs3eHiXUJie7rX5Suxt2aCX/D5CK6HYteIbL35KfK6z8sYNmyrs1SYpmccm8Ba/ek JZ+rQISwjQBUMOlTx8FxfcLMECz/g8Me+plLuMkTCeJ4bYGRxoSowiLiJ+D+RXmLn5w7 i2Pw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=JgGqYJxV; 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 m11-20020a056402510b00b004615937b174si30022295edd.480.2023.01.03.02.34.12; Tue, 03 Jan 2023 02:34:36 -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=JgGqYJxV; 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 S237296AbjACKbx (ORCPT + 99 others); Tue, 3 Jan 2023 05:31:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55810 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236995AbjACKbk (ORCPT ); Tue, 3 Jan 2023 05:31:40 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D9FE2A18D; Tue, 3 Jan 2023 02:31:38 -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 ams.source.kernel.org (Postfix) with ESMTPS id 5DCE1B80E91; Tue, 3 Jan 2023 10:31:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1A76CC43396; Tue, 3 Jan 2023 10:31:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672741896; bh=8cU14J4fNQ860AwDHJzhxOG7AJPdC23m/QS0H0H09yM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JgGqYJxVwg4LNpVQ0S2kS0Dzx0r5f287PyRJjq25qzcbC+jHwhat1P3ZqnIzyAVjo lVu36YhKP3IznvKM7/5RTIUvya/bmRMnBoDA2Jll0soLzhKrqhSWrIF2hJnoFr7cIl eln0dPZTp80TZQvRXPWwxK+ACCgg1/hYfQURJCoirEmnXTEQdlUncujIkk3cLEcIVt STOPWglHXBibas7GOEFnUa9zPO9xdFoVc1aKI6yvZ1Ke2dr7VZygsXLwiHlF0kSbxI eGeVmhnSufqXfIiA2urYehHD2IeekSnfVb1CV6Z4IM7X0NrqLxV7uPw7meU9ax7a0/ nXYFjsqDUVknA== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1pCeaJ-00047S-Qq; Tue, 03 Jan 2023 11:31:55 +0100 From: Johan Hovold To: Bjorn Andersson Cc: Andy Gross , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Srinivas Kandagatla , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH v2 3/6] arm64: dts: qcom: sc8280xp: clean up tx-macro node Date: Tue, 3 Jan 2023 11:31:38 +0100 Message-Id: <20230103103141.15807-4-johan+linaro@kernel.org> X-Mailer: git-send-email 2.37.4 In-Reply-To: <20230103103141.15807-1-johan+linaro@kernel.org> References: <20230103103141.15807-1-johan+linaro@kernel.org> MIME-Version: 1.0 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1753997195029779529?= X-GMAIL-MSGID: =?utf-8?q?1753997195029779529?= Drop the bogus address and size-cells properties from the tx-macro node, which do not have any child nodes. Reviewed-by: Konrad Dybcio Signed-off-by: Johan Hovold --- arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi index c1ce2d7b3675..11e3d560c627 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi +++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi @@ -1784,8 +1784,6 @@ txmacro: txmacro@3220000 { clock-output-names = "mclk"; #clock-cells = <0>; - #address-cells = <2>; - #size-cells = <2>; #sound-dai-cells = <1>; status = "disabled"; From patchwork Tue Jan 3 10:31:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 38368 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4542665wrt; Tue, 3 Jan 2023 02:35:27 -0800 (PST) X-Google-Smtp-Source: AMrXdXs3Ythb9Ez9vZjgPCBUz8hg/7Y90kXqUj2mnAwVVPKx8J9QknT0gB2BodKbPbVntlAmTC9J X-Received: by 2002:a05:6402:22f2:b0:48b:85e0:fbef with SMTP id dn18-20020a05640222f200b0048b85e0fbefmr11217352edb.18.1672742127028; Tue, 03 Jan 2023 02:35:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672742127; cv=none; d=google.com; s=arc-20160816; b=EKJpl//V62a93ku65ARugbo1B3fgsz+3zD9J6L4BatY4jHzCBg4VSGJNlVqma8m2Zs 8hsqJBc5bzYx/CbKvhw6kDNcEYJMSVLVCuSD1tuzV+ANtcxoQy8t8s2leO0+rto7/Nel aj+9oDQHlJa1OjCBq35F0EJVmbqf2iKd/UUFZ3+QyiQ+7T9M1qqWI62maMQXOc6BdUOU i0rtI+VXhjcUdFXu/Qes6q5DHUdRYWxT36f0Ua0JP2vVjDA0dA+xibG8cHn8cnXWQiYi TG1gfLaGyqFYjh9+ia0clZrlBh67FSZp9XegNB+ZOyCiU+WmRm6l1V2M/R2iN1rbEKwI oDeQ== 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=QlVNVNtUt/wRTus8GP7ODEqkrDjea6KSvqwUcPmAnXE=; b=fNiG9Y5+I8IPkvvjiuqSYHumuRrin+JLeUMcFNKIhqk1P7W0NPV7k+QeRLHoDb+R6z a+nPBpcyP7r857cwz4TNcVapX8EnYtBNvKNEyfhFnm+qhPmdDOt8gjxBXU7yqrlm47lq JnrMuI7ncoeYRoT0zWco6Z5hsILz6o/5jbMToivhlGCzejNO9c2ORIaLWxNG7hbj/Kxn WisTcYrT5zfg39NYyQx4ktHhCagC+kiVBu/yQUk/9Ny4iGwhE7YbvzcmYn4RiyTH2HQH dGnIwI6I4+emd9k4y4d/FZ7v3Fw4TIShtstQ3DnXUDXFz3VqotKTYfHFuC+mY57g39ci i6Ag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=S00EVI8C; 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 t6-20020aa7d706000000b00461bde34a12si24178860edq.627.2023.01.03.02.35.03; Tue, 03 Jan 2023 02:35:27 -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=S00EVI8C; 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 S237283AbjACKcJ (ORCPT + 99 others); Tue, 3 Jan 2023 05:32:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56130 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237128AbjACKbk (ORCPT ); Tue, 3 Jan 2023 05:31:40 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DA5C3AE53; Tue, 3 Jan 2023 02:31:38 -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 ams.source.kernel.org (Postfix) with ESMTPS id 6D8DFB80DE8; Tue, 3 Jan 2023 10:31:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 15CA1C433F1; Tue, 3 Jan 2023 10:31:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672741896; bh=hphMJ193zT6k9KcHC6HtQ6xYHAXgbuX0OJNoCvAJOmg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=S00EVI8Cd2nscmHSpGY8cp58i+PfnI88Mdc9Caj0qBFv9W5Jxj2ar19yh7OfHGqR7 zCa+NSymzAsRb72IyplC5CMLlDtuKdLO5RVbMgmSBNHInKOB/9iNnNGVa7Suwogwz8 xtzfcLO5z9FPbBubhzQIKEi+4oEKhfAhsYgK3Oe0ur5vXQDztNLWW2IQQ8QLAtpUOF c+bixkpxGZlZV7rEDF1xNVHYzUIAhwLoCbp7m2e7vJD9Rh24VbNYXN4hSu2K2ZRWmt euC8IxLSqkjaCvtyjxkrCE99g5P8wp5DquxEbvGW434q6eOT4p9bJdjUj12MlES32C caqPJX1KGCqaQ== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1pCeaJ-00047U-U3; Tue, 03 Jan 2023 11:31:55 +0100 From: Johan Hovold To: Bjorn Andersson Cc: Andy Gross , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Srinivas Kandagatla , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH v2 4/6] arm64: dts: qcom: sc8280xp-x13s: move wcd938x codec node Date: Tue, 3 Jan 2023 11:31:39 +0100 Message-Id: <20230103103141.15807-5-johan+linaro@kernel.org> X-Mailer: git-send-email 2.37.4 In-Reply-To: <20230103103141.15807-1-johan+linaro@kernel.org> References: <20230103103141.15807-1-johan+linaro@kernel.org> MIME-Version: 1.0 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1753997248630825220?= X-GMAIL-MSGID: =?utf-8?q?1753997248630825220?= The wcd938x codec is not a memory-mapped device and does not belong under the soc node. Move the node to the root node to avoid DT validation failures. While at it, clean up the node somewhat by adding newline separators, reordering properties and renaming it 'audio-codec'. Reviewed-by: Konrad Dybcio Signed-off-by: Johan Hovold --- .../qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 50 ++++++++++--------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts index cc67a80758af..23c1ca44ec11 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts +++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts @@ -21,6 +21,32 @@ / { model = "Lenovo ThinkPad X13s"; compatible = "lenovo,thinkpad-x13s", "qcom,sc8280xp"; + wcd938x: audio-codec { + compatible = "qcom,wcd9380-codec"; + + pinctrl-names = "default"; + pinctrl-0 = <&wcd_default>; + + reset-gpios = <&tlmm 106 GPIO_ACTIVE_LOW>; + + vdd-buck-supply = <&vreg_s10b>; + vdd-rxtx-supply = <&vreg_s10b>; + vdd-io-supply = <&vreg_s10b>; + 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-dai-cells = <1>; + }; + backlight { compatible = "pwm-backlight"; pwms = <&pmc8280c_lpg 3 1000000>; @@ -632,30 +658,6 @@ &rxmacro { status = "okay"; }; -&soc { - wcd938x: codec { - compatible = "qcom,wcd9380-codec"; - pinctrl-names = "default"; - pinctrl-0 = <&wcd_default>; - reset-gpios = <&tlmm 106 GPIO_ACTIVE_LOW>; - #sound-dai-cells = <1>; - - vdd-buck-supply = <&vreg_s10b>; - vdd-rxtx-supply = <&vreg_s10b>; - vdd-io-supply = <&vreg_s10b>; - 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,sc8280xp-sndcard"; model = "SC8280XP-LENOVO-X13S"; From patchwork Tue Jan 3 10:31:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 38367 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4542639wrt; Tue, 3 Jan 2023 02:35:22 -0800 (PST) X-Google-Smtp-Source: AMrXdXtlBvFdECDVfLxKgwVaL/AmvJFuF7hb5sNvXH18DanolZjNWZnIz+dzqDGp4a3970jlV8IS X-Received: by 2002:a05:6402:12d4:b0:45c:835c:c6d3 with SMTP id k20-20020a05640212d400b0045c835cc6d3mr36180561edx.4.1672742122589; Tue, 03 Jan 2023 02:35:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672742122; cv=none; d=google.com; s=arc-20160816; b=yefHg1RT0ZupBsCCMRRUcxX9oeBLv1NBo8V25HBCRfeKvIwbH7gAux4GESXgsyjMgO b6hHf55E8r8vmZuX70atNQIRatG0spuP+/URkFXOFkbC1dzuz2x2XI3zbm3z9OI5I3zA ylDV08ZGOdI9X+ueAZF87YUTdKckVR4Lfm0FL8LO6ujaYHILBrMtAPN9k70iJ08G1sf6 4TddE63GiExBn8Ut5wz/OGXrqD4HvRRBIAm5MJZRUM0KSVk7x1XHVRo0ddDwdNdDSfOz e+hT9iGJyc87K3eiGx+eERZz2y1zEvIwrrgFFW+46099eMisYgmmti1k46mbWjsPQ7Ho m/YA== 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=/F5YffXtaDaZuh1I4GY4ZziWtUqXrA5515SUuBgE91A=; b=qaRzHXnr1d1nbYq4/HWLyxG5c/ghcIB7GuFvUffEiu54C3OslijhlXOvfNUgjJk0ba /oECvC45GAFC6oUWz/S8d0U2EkyNZJpF7dm6lLlC27AQExOzyK+o6612OXkYZeyDid8x NJocH1c/fWO9BG507DQpKKIvazr9OVZfANIWle6YtFu3zLsnCm9LrZEelci/qyUkgUny N6PFbmGRSh/xptmS8kNzjUX4RVeQPhckWPQVx/iHGjd8uKWvEgLwBRKCThadWIhmkCwq Z5kPESx/1kxlv3AH+MFwXGR3hKfT7LUNqA8dXtgz5x7DC9BpCt40FZEFBiKNJVYcepFD XdMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Y0VGFVPK; 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 y19-20020a056402441300b004763231785asi30319799eda.33.2023.01.03.02.34.59; Tue, 03 Jan 2023 02:35:22 -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=Y0VGFVPK; 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 S237236AbjACKcG (ORCPT + 99 others); Tue, 3 Jan 2023 05:32:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55598 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233235AbjACKbl (ORCPT ); Tue, 3 Jan 2023 05:31:41 -0500 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5B986AE4C; Tue, 3 Jan 2023 02:31:40 -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 sin.source.kernel.org (Postfix) with ESMTPS id 878AECE1077; Tue, 3 Jan 2023 10:31:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 19A31C43392; Tue, 3 Jan 2023 10:31:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672741896; bh=2q/48MqhGFOxcT/3zNrc8bTTrNs1xBgO264Dm8fQjwQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Y0VGFVPKNviwc+bn8vZ+jraO46rF2+1JTJix12N6ZGomiCTtQIZIEho+8VoyrPkPS vgaHvvr0I6DyJR3SkRZ6NcmuskYvvJ7B2L8T0AUoLVAi2tKjcPBXIlNCySqriSZOaT vxkqhAtxoJUY3wLfBF6bcTFnsqLCK+xVCDo9IKGgKAAabAUBXkNt5ZUJSOrMBXuA/Z /5sfKr8A74vRtNyZUuFUOJrcNzwfNPjCC8O64q7xmNkXSW6kSEph7hy0RCUvb3xY+O sb5TBwxhRF75DU8VM9zbD/a9N6XJULrOMfZEgngz4ne4D8S9Fxymn2H/e9jj1l1dmm eXfUCqX2fMnvQ== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1pCeaK-00047X-10; Tue, 03 Jan 2023 11:31:56 +0100 From: Johan Hovold To: Bjorn Andersson Cc: Andy Gross , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Srinivas Kandagatla , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH v2 5/6] arm64: dts: qcom: sm8450-hdk: move wcd938x codec node Date: Tue, 3 Jan 2023 11:31:40 +0100 Message-Id: <20230103103141.15807-6-johan+linaro@kernel.org> X-Mailer: git-send-email 2.37.4 In-Reply-To: <20230103103141.15807-1-johan+linaro@kernel.org> References: <20230103103141.15807-1-johan+linaro@kernel.org> MIME-Version: 1.0 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1753997244222150154?= X-GMAIL-MSGID: =?utf-8?q?1753997244222150154?= The wcd938x codec is not a memory-mapped device and does not belong under the soc node. Move the node to the root node to avoid DT validation failures. While at it, clean up the node somewhat by reordering properties and renaming it 'audio-codec'. Signed-off-by: Johan Hovold Reviewed-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sm8450-hdk.dts | 53 ++++++++++++------------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm8450-hdk.dts b/arch/arm64/boot/dts/qcom/sm8450-hdk.dts index 4de3e1f1c39c..8ac7265d8c10 100644 --- a/arch/arm64/boot/dts/qcom/sm8450-hdk.dts +++ b/arch/arm64/boot/dts/qcom/sm8450-hdk.dts @@ -17,6 +17,32 @@ aliases { serial0 = &uart7; }; + wcd938x: audio-codec { + compatible = "qcom,wcd9380-codec"; + + pinctrl-names = "default"; + pinctrl-0 = <&wcd_default>; + + 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>; + + reset-gpios = <&tlmm 43 GPIO_ACTIVE_LOW>; + + vdd-buck-supply = <&vreg_s10b_1p8>; + vdd-rxtx-supply = <&vreg_s10b_1p8>; + vdd-io-supply = <&vreg_s10b_1p8>; + vdd-mic-bias-supply = <&vreg_bob>; + + #sound-dai-cells = <1>; + }; + chosen { stdout-path = "serial0:115200n8"; }; @@ -407,33 +433,6 @@ &sdhc_2 { status = "okay"; }; -&soc { - wcd938x: codec { - compatible = "qcom,wcd9380-codec"; - - pinctrl-names = "default"; - pinctrl-0 = <&wcd_default>; - - 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>; - - reset-gpios = <&tlmm 43 GPIO_ACTIVE_LOW>; - #sound-dai-cells = <1>; - - vdd-buck-supply = <&vreg_s10b_1p8>; - vdd-rxtx-supply = <&vreg_s10b_1p8>; - vdd-io-supply = <&vreg_s10b_1p8>; - vdd-mic-bias-supply = <&vreg_bob>; - }; -}; - &sound { compatible = "qcom,sm8450-sndcard"; model = "SM8450-HDK"; From patchwork Tue Jan 3 10:31:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 38362 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4541894wrt; Tue, 3 Jan 2023 02:33:11 -0800 (PST) X-Google-Smtp-Source: AMrXdXvVhp9SiKFjWQT3Zcah90zn5qXtzoNpzsbjf4HHAvrSdNzL2oXBiva+kHI4cnLez3mpRnku X-Received: by 2002:aa7:da09:0:b0:480:95f5:1e36 with SMTP id r9-20020aa7da09000000b0048095f51e36mr34560991eds.23.1672741991702; Tue, 03 Jan 2023 02:33:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672741991; cv=none; d=google.com; s=arc-20160816; b=wb2IsACmOidxGBAEXigdxeXPF1uLoAD65VURM+2HVZP4B5D3uF4/i0n3hC387Y5AbU ZmisFUtg6qmzC4TV/8uYnp+ArbiJQH6EbfkNR/mKzrB/Hf9NwHll0oZc9K9J/AjhMkJX F5UVpXwZ6I0K0/TaUyTkmyXM/WqrfYj9CNowLjfi85KhYhF2rJCTd3MuFvGalIqWZPrY gLraKGcHE4SwuTkLV6dl6Lb4Kus7qu1ZH2L3LJh3WHbgZFxgUuWo6VGU4yoOJScbMbmY aq98kB0A9p0jORn4FHtRvgLoNSSmR7msPKh1lHiP3BPcmxwSgwHJ3g2VLkZmuVhOmomy b7rA== 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=muNzEm6yuA2pUTZhiraqD8peSsaL8Yl+LOzBfIjJMhI=; b=pQ3C3ukc/B4vyTpIilTI9DrKiKXq4lkq0eYdLWocg8nh6pEIS9ScoooyiZNejuihU9 pPiR27sCbB2W96DI7aFqMt1+36hkU1aUaefJpSEl/Qjw5PCMmpb4jTYmHuMJtPdloCj7 R4VcbKYO5dY1FwsLJiOb2NIqQqejjTN1zLZDFi11B++yiyhSgsWGFkqkkuBRp0I1LDRc 4k60k9sE67oVlzdp6nYF3hb+DXDMjamcllBMMBG2k3Gx/V6arj9tx4DPUADLp+q0X9n5 90x59/Kie00TGvfmKXABjFgW4ussWbCUPSzkCseoBCljwQOjZsyTXeBHg5UBRqNjE0XR 5QQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ZDeWAoC0; 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 fd14-20020a056402388e00b00485dd65ad2fsi18659084edb.356.2023.01.03.02.32.48; Tue, 03 Jan 2023 02:33:11 -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=ZDeWAoC0; 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 S237182AbjACKbp (ORCPT + 99 others); Tue, 3 Jan 2023 05:31:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56012 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236963AbjACKbi (ORCPT ); Tue, 3 Jan 2023 05:31:38 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9D7C1FACB; Tue, 3 Jan 2023 02:31:37 -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 396BF61225; Tue, 3 Jan 2023 10:31:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 74636C4331F; Tue, 3 Jan 2023 10:31:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672741896; bh=+laXW6G2LvHTXlCq2XMEY0hkFcDigz1L1GYdv5f4Et4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZDeWAoC0yftgz7ezcUoJPA10wWZTk5TDDSpmCmanngG56uyeqAJKohoZUAGNLCPHC 9EkYN97U6zXPSnn6rL2HHydZgGRitz3OA3+0ZA6pSGYv0a/ngpfXwq/rnzcOK9tNWj AKatkxOPtmiciF46si9LnGAQjgz5dvzMY9fDjL0gq9mXfbcmPgheV1u6Q4z54dOejz SoTQuMkIkoLa4V4lcKMAmaqfC9ktVqojtLPI6FbEPrbGuDTmQlv5CckXRvM4ROMLRo RgtjMX2b0uXZfgHdnzaFN4aeSf+ceN0O8LS7xpBtUsVbKkGCJW6rVZcHw0rA5QfYgF QJZqGNGqadJqQ== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1pCeaK-00047a-3t; Tue, 03 Jan 2023 11:31:56 +0100 From: Johan Hovold To: Bjorn Andersson Cc: Andy Gross , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Srinivas Kandagatla , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH v2 6/6] arm64: dts: qcom: sm8250: clean up wcd938x codec node Date: Tue, 3 Jan 2023 11:31:41 +0100 Message-Id: <20230103103141.15807-7-johan+linaro@kernel.org> X-Mailer: git-send-email 2.37.4 In-Reply-To: <20230103103141.15807-1-johan+linaro@kernel.org> References: <20230103103141.15807-1-johan+linaro@kernel.org> MIME-Version: 1.0 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1753997106557755071?= X-GMAIL-MSGID: =?utf-8?q?1753997106557755071?= Clean up the wcd938x codec node somewhat by adding newline separators, reordering properties and renaming it 'audio-codec'. Signed-off-by: Johan Hovold Reviewed-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm8250-mtp.dts b/arch/arm64/boot/dts/qcom/sm8250-mtp.dts index b741b7da1afc..0991b34a8e49 100644 --- a/arch/arm64/boot/dts/qcom/sm8250-mtp.dts +++ b/arch/arm64/boot/dts/qcom/sm8250-mtp.dts @@ -23,18 +23,16 @@ aliases { serial0 = &uart12; }; - chosen { - stdout-path = "serial0:115200n8"; - }; - - wcd938x: codec { + wcd938x: audio-codec { compatible = "qcom,wcd9380-codec"; - #sound-dai-cells = <1>; + reset-gpios = <&tlmm 32 GPIO_ACTIVE_LOW>; + 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>; @@ -44,6 +42,12 @@ wcd938x: codec { qcom,mbhc-headphone-vthreshold-microvolt = <50000>; qcom,rx-device = <&wcd_rx>; qcom,tx-device = <&wcd_tx>; + + #sound-dai-cells = <1>; + }; + + chosen { + stdout-path = "serial0:115200n8"; }; thermal-zones {