From patchwork Mon Jan 2 10:50:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 38076 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4106569wrt; Mon, 2 Jan 2023 02:52:32 -0800 (PST) X-Google-Smtp-Source: AMrXdXvL5kbGCWBAd/BELnH18DPqa03nLfsJFY2IE+gmd76R9xQMuFZEwUFxCGX1p8H3dLzzciFn X-Received: by 2002:a17:902:a588:b0:192:50cd:97e2 with SMTP id az8-20020a170902a58800b0019250cd97e2mr37960971plb.26.1672656752043; Mon, 02 Jan 2023 02:52:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672656752; cv=none; d=google.com; s=arc-20160816; b=D3oIEjrbkSQydcH1CwK6KEFKp7whmYx7VFwoK1qIDC08GaQrDkCx9biFhupxlL+Tnq NHOcS7gudJyk8+wLbUvSCTV6pC1SHMF37JZojzZeRBPGTqIpYAZIvBlOmp1UET22EW4J yjWU29qpPQ19WBDob+ZIqJ098uMZH7+wJxrViUdwQpKQKGTNCFxQ8ggZJTZNrQTjwwiF YnvFP5LCO1gM1h38Jt+AQBRG4W60qhL/VzcUJpyJmScl4U2iV84ItduyDgQHFNTwq4PD Xr25ZMoY92LpuR3eHTXST4ZoHgSXyp5EbwuXLQPSbH5e6ZD4inc7b6lF7pqPXURd25NA 3eOQ== 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=/kbzZw8zLK8uXgaGh8fsdLXCatFQYhwm75oH3DlZWPY=; b=wrwrwF467aIyq1bw8LkGy+iSEdsXOzyXk9qlh6lHFHeXJ4s/76ijZFLrKDCMohOy9a vIqpgz/mqFIw5U3dlFbzYiLxvWfrA3xKSqJV/el1NLNAU6YdaGMsDMGDhx+eoWMsBAmJ vYCE5IJbWYTlm1uJI1sRAznQa6OouV8RIZXnRQgqCgv99lgPPzMS45V/KxZ86fM02XxG Y8OXtmUjMW6fhtPL2A3VAClV6+v03NLcIYTAwVfu8lIH9tdcFV9/0PdkYYkM/JCFZyA+ tkb1lBHWuzFLJvto5sFnFPJIq/RFEVY7xDAuP5CuvIdf6ZGQHShsCw/4O0D0FTyGoLbs phUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=rq3NFFTH; 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 d17-20020a170902ced100b0017808c0aa8bsi31547661plg.115.2023.01.02.02.52.20; Mon, 02 Jan 2023 02:52:32 -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=rq3NFFTH; 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 S232726AbjABKv3 (ORCPT + 99 others); Mon, 2 Jan 2023 05:51:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52438 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232645AbjABKvN (ORCPT ); Mon, 2 Jan 2023 05:51:13 -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 0C376B00; Mon, 2 Jan 2023 02:50:54 -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 B1CE8B80CD9; Mon, 2 Jan 2023 10:50:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5E81AC433EF; 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=LAiUsLgBSqchR7MaqJBuNMrNsFYWdX2WB88AiqKTpTo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rq3NFFTH8HwkYw23+gCH8qtJgNUpwrKFOPLDFW1NLRu59A4lPzIy8Ae8lP7LIaxiV cneXsitEm2O0RcPxJsp3b6bmyDHVAulu1cE2TUKx5rl0LZciVUyeJkMBmGaczoy8x+ b1OyNLte9MbaXCcyFQ3s40i+e/NMhJSCB01kHLzaZNVsDfWTlnw8w9t4DuhTdmBkSA SyVsWVR2cvoMzcKfgwhPsvw3YTSQiqX4pDVzlzyFWvCUd0KjUHwm9b6CStrYiMiXbG j8CwJ65EHTaDstgEW8VkaSL1q2hVKQ5p59uk3d4lUhOm4maF23kYdZhMFRpXsKuFs7 NoJZTsDIOsAzg== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1pCIPM-00026q-6n; Mon, 02 Jan 2023 11:51:08 +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 1/6] arm64: dts: qcom: sc8280xp-x13s: disable soundcard Date: Mon, 2 Jan 2023 11:50:33 +0100 Message-Id: <20230102105038.8074-2-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 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?1753907726136838077?= X-GMAIL-MSGID: =?utf-8?q?1753907726136838077?= Driver support for the X13s soundcard is not yet in place so disable it for now to avoid probe failures such as: [ 11.077727] qcom-prm gprsvc:service:2:2: DSP returned error[100100f] 1 [ 11.077926] rx_macro: probe of 3200000.rxmacro failed with error -22 [ 21.221104] platform 3210000.soundwire-controller: deferred probe pending Signed-off-by: Johan Hovold --- .../boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 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 0201c6776746..97ff74d5095e 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts +++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts @@ -649,6 +649,8 @@ wcd938x: codec { qcom,mbhc-headphone-vthreshold-microvolt = <50000>; qcom,rx-device = <&wcd_rx>; qcom,tx-device = <&wcd_tx>; + + status = "disabled"; }; }; @@ -669,6 +671,8 @@ &sound { "TX DMIC2", "MIC BIAS3", "TX SWR_ADC1", "ADC2_OUTPUT"; + status = "disabled"; + wcd-playback-dai-link { link-name = "WCD Playback"; cpu { @@ -731,6 +735,8 @@ codec { }; &swr0 { + status = "disabled"; + left_spkr: wsa8830-left@0,1 { compatible = "sdw10217020200"; reg = <0 1>; @@ -757,7 +763,7 @@ right_spkr: wsa8830-right@0,2{ }; &swr1 { - status = "okay"; + status = "disabled"; wcd_rx: wcd9380-rx@0,4 { compatible = "sdw20217010d00"; @@ -767,7 +773,7 @@ wcd_rx: wcd9380-rx@0,4 { }; &swr2 { - status = "okay"; + status = "disabled"; wcd_tx: wcd9380-tx@0,3 { compatible = "sdw20217010d00"; @@ -781,6 +787,8 @@ &vamacro { pinctrl-names = "default"; vdd-micb-supply = <&vreg_s10b>; qcom,dmic-sample-rate = <600000>; + + status = "disabled"; }; &usb_0 { From patchwork Mon Jan 2 10:50:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 38078 Return-Path: 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 + 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 ); 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 ) id 1pCIPM-00026s-9I; Mon, 02 Jan 2023 11:51:08 +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 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 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?1753907732210008676?= X-GMAIL-MSGID: =?utf-8?q?1753907732210008676?= The sound nodes in the SoC dtsi should be disabled by default. Signed-off-by: Johan Hovold Reviewed-by: Konrad Dybcio --- 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"; From patchwork Mon Jan 2 10:50:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 38079 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4106649wrt; Mon, 2 Jan 2023 02:52:49 -0800 (PST) X-Google-Smtp-Source: AMrXdXtyll//g2rjJ1oOks/tnma+NDgsfn6KdRJu0hGL9Chymk8yHSql35KWeK5uf622xTcvyGMI X-Received: by 2002:a62:6145:0:b0:581:7cb0:1eb8 with SMTP id v66-20020a626145000000b005817cb01eb8mr20255507pfb.17.1672656769679; Mon, 02 Jan 2023 02:52:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672656769; cv=none; d=google.com; s=arc-20160816; b=n8pIO/nrwTKFst6XI7cVg/ErvIRKA/9IWvu7rLl5Z+2rPUtPNo/2KNrxGeEAftM1B/ gsPOeie6wF9QXtQYQe1tBSpwkVhdp4bKEugobdUcGJqVQmUaeoHR8y/ehKEMxDItmdCs t3/YYPHmqVb98ZGIYjFl15+/vGMqD8SOVNrj3i/milefMT3tOB/YJqdY/3FYo50WkF6F yb11VcI9CqdwVMAyOINPufmUk5dOEFwpReHtNg4SC3Eu4S9GFBwjdUHg4oaO1qE9cepp wlWZdVa1El9ebHwRLeybhMdM9dlpMJXRVs2eLKpNELKGkraiTF6w6DTWyl29gL67rYK+ jPCg== 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=plT39dKb6NgOZIqf9kqxsNoc/MIIwP40yb/9hbOvV8Q=; b=eS0Fkl5rr/VU1ESxX+96FUVA9TkHCv/JHJ6VtnrJHna7dKerkNnozpz2eHunsU0SFQ 2ebQYgvLyV059Aojalm3kK54FgU9syFeGptCC5kPVhgpF3rbdLXe9mZRYx+wlfe5e9Oq GyjtQFwpOphUFSoeIGJucBD8FekAndyYG8TdkRoREvVusr6wbEQwomHxuSgbCYlr/rOG qngeaPplRdaghM/A6PxZlxUNezgC1ZU0dcLKIGzz7hcrNvUGpGZaVHPAKE9mcqmamofu loZgM+5Lv9M1CP6+yNbZE4TO6fd0meY6bdKs6YABt4Dg40k5wNWZ5BuPj7bAtDHnLFzv zTsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="eL/zhttl"; 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 v63-20020a626142000000b005780084676asi27078340pfb.367.2023.01.02.02.52.38; Mon, 02 Jan 2023 02:52:49 -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="eL/zhttl"; 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 S232546AbjABKvr (ORCPT + 99 others); Mon, 2 Jan 2023 05:51:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52440 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232647AbjABKvN (ORCPT ); Mon, 2 Jan 2023 05:51:13 -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 1755262F9; Mon, 2 Jan 2023 02:50:54 -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 C1666B80D06; Mon, 2 Jan 2023 10:50:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5B7E9C433D2; 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=YqFGwlEmxRNKX5iyaOrEoj3/vHUZ53nEbmittt6HVlo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eL/zhttlaAbVjQP2g0BD3QL4M2+TcFUWDM9mc8nQDKqeW/l7asBwcN1SwVTx1VScn R+pzqb2PCJUhjbsGUiYKCEz59Ny4bdTtLCcCu3ZsZQVWJNZ6LWkeuJS2SeXkyhl1W8 xGublv0qdtbxk88MCMLC6SmLZR6lRA23sOYXY4WCPLBhwNsM7MaFjaI6CVihqFh3Ax ODMT/ytvAhg0EweZjD64jpK7LZg7d5iUs7WtXW4bqZv0lb+K84cgZO9Y+VoHJlH6Gk YDrpc7m0NDSWSMurB/fjIDaeKXATsoUNEP+ZQtdMU2Qv7guDSG9IWpfbr+eFHYU3Ar 2+EkB4lqs+jsw== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1pCIPM-00026u-Bi; Mon, 02 Jan 2023 11:51:08 +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 3/6] arm64: dts: qcom: sc8280xp: clean up tx-macro node Date: Mon, 2 Jan 2023 11:50:35 +0100 Message-Id: <20230102105038.8074-4-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 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?1753907744960617018?= X-GMAIL-MSGID: =?utf-8?q?1753907744960617018?= Drop the bogus address and size-cells properties from the tx-macro node, which do not have any child nodes. Signed-off-by: Johan Hovold Reviewed-by: Konrad Dybcio --- 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 Mon Jan 2 10:50: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: 38077 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4106576wrt; Mon, 2 Jan 2023 02:52:33 -0800 (PST) X-Google-Smtp-Source: AMrXdXtwfpv0ymguL7aIiTz9udTsjqyTTiEDzGtmb2J4wi1f3ylAxT8GPNVhV2RoBKFNozVwU1om X-Received: by 2002:a05:6402:c91:b0:463:398a:9fe7 with SMTP id cm17-20020a0564020c9100b00463398a9fe7mr32462783edb.34.1672656753488; Mon, 02 Jan 2023 02:52:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672656753; cv=none; d=google.com; s=arc-20160816; b=gYjOhrj7V/8Z7qmSwd0EH50Typo3sSIIciZe8IjX6ziJMIXchRKdXlJhA7B5iJtcwk APNEesbQT8PEpU45OX1TwbGtZenVTXyeHOTLf/lSAscbP5XHnEsclzgWcUiFsEAojo5l kmkc5fDHnJ0CX7xniaMhygvk1SZOGYTZw1kpkK4IkdTsC4AcFxnIP/fZR9uu4l9S79pU 76ui+fxrMWWCQ42/iuM+ot3i45dT39vvozSDJg67SkeXnd4Y5EDFArik0Q5C31P5dkCL Js69LxXeS6H4z5gn6CosyuzNxZ+srOlv2VpRARJ8/ktmDVjnvwwMtqavQRQLOHyBGr4a O2+Q== 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=SF/BMnJFChGbP6OdxmSsZaLt5glZOu/uPKpkeYrRgZs=; b=p7LCxKVJrrjxzhHqU25Rhno+AmHB7E3JGddSMsDs85sIO8Mcky99hbCk2TWKVzVkj2 e8UzTPibjuHmgZ+PlVRcxtGLOUe2ke9KAZDThW88IW/aTRK5Kk1seavqDyDqr8ir+utk HRKRHsU5ThBGn0i9DdCbzd7uT3J+cj+sAhJ/mKWsCU1hv1PUzk2qjekbNW+YMKOUy4Nu t4x984VfQgQsbaUhc2Tft73VRrd3qzcLX/G04mh/flJLtv/LIvkfl0rKExIfs+x+EW7F kXBTjSGzYYU2ok8sL2mvGYqcTpE7/v8959PRtyaOhBdH4tBIVkQnNjRfJGYTN7dFUC73 4AMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Ymvz2PV6; 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 o12-20020aa7c50c000000b00489d47b3854si9199535edq.395.2023.01.02.02.52.07; Mon, 02 Jan 2023 02:52:33 -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=Ymvz2PV6; 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 S231653AbjABKvd (ORCPT + 99 others); Mon, 2 Jan 2023 05:51:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52424 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232642AbjABKvM (ORCPT ); Mon, 2 Jan 2023 05:51:12 -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 05F3D62EF; Mon, 2 Jan 2023 02:50:53 -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 9199060F2E; Mon, 2 Jan 2023 10:50:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 82C45C433B4; 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=Nyqaf4bMK9dpEeEzGEV6JiYvRsVHPutFOLZwu11jQ2g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ymvz2PV60CNcTI+Gcs/E6FuKXe0Yshdl7PycIGVyxCm3+pEqrIZRHCo3bDYcXHexm F7iv/3w/PRyBeSPumFOpIvLpjbuKNXIjum7BieLAfmTn+xJtxr/0K582Ht+IOrqXwd u32LHlAUxHuKVQciYqj2XwSFe8q3ovHipiFH9DEIxLURAzpvPFRzwYmujLxqbWcnsd KzReIfY0jP8j/GrDGoPx69YyHAKHOwMaqnpIMrkVebvnTxAWiKtJ+xXIIx4C6TVo74 7LLMSeLtCgfZoPdRG1QC5jZfUKEIvzKuWD7mKLU4S8prQIoxpjMy/3p5IPieN1sU3u ndv+Chf/X1VIw== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1pCIPM-00026w-EE; Mon, 02 Jan 2023 11:51:08 +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 4/6] arm64: dts: qcom: sc8280xp-x13s: fix wcd938x codec node Date: Mon, 2 Jan 2023 11:50:36 +0100 Message-Id: <20230102105038.8074-5-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 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?1753907727618360968?= X-GMAIL-MSGID: =?utf-8?q?1753907727618360968?= 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'. Signed-off-by: Johan Hovold Reviewed-by: Konrad Dybcio --- .../qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 54 ++++++++++--------- 1 file changed, 28 insertions(+), 26 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 97ff74d5095e..ae67c11bfc22 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,34 @@ / { 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>; + + status = "disabled"; + }; + backlight { compatible = "pwm-backlight"; pwms = <&pmc8280c_lpg 3 1000000>; @@ -628,32 +656,6 @@ &remoteproc_nsp0 { 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>; - - status = "disabled"; - }; -}; - &sound { compatible = "qcom,sc8280xp-sndcard"; model = "SC8280XP-LENOVO-X13S"; From patchwork Mon Jan 2 10:50: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: 38080 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4106658wrt; Mon, 2 Jan 2023 02:52:52 -0800 (PST) X-Google-Smtp-Source: AMrXdXsvGV6OM/0kWYRR0NbBdS9Lxh9cpVZvDgBKS1xXe8Q33Tk4i8PcsI8HExCmNvjehTdHQo80 X-Received: by 2002:aa7:ccc2:0:b0:477:8ab8:43e0 with SMTP id y2-20020aa7ccc2000000b004778ab843e0mr34235479edt.2.1672656772000; Mon, 02 Jan 2023 02:52:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672656771; cv=none; d=google.com; s=arc-20160816; b=RTyTGPG9o2rzr9WGEGdg3N2A66PbV1+O0PJeKedpZnGXZPX+kIzMp319F4v1qL4Cag NxwTArXROnYM5JNRxctJf+lJvVJuxk6Ydtbz0uTwPMcJV3FyNv0bm6JEnfi2DTdNH3bq OEe5u+qFJRrUNwnJ1GlsWQTdbR17P2Wq7nbF3FT8Jr25Wb4fqrmlaztkDBTj/aWE7sw2 AbPq6xFQg/kVSvTT0JqylvcYE5K7lRHSwTazp02cT3Fj+yg3KJ/4B5iKNB8Fz/yTnKNe qAa+cmNIlqnIJvCK7WjqcYw4VuX32jos/TGgJxxGaWxQGftXYn2BmogXuKaXloNCTUoA oTNg== 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=Aj4mi5KIExSlFkgkIT3i6fwMgZc++WpFlO4t8X0qooU=; b=fps+cIOqS+xAKcozl9sIs/+HIgwfBya6wvEOJcptYO5bUy+k6amtSH5ZAJnilvMi4v xzYuamUQu6oTa3qFtwABtW/zz0Me6BDiwo9094soVU3HP0b494/Q65dHxwBZ4mn2XcAJ Tih93hEQsWwL3Wyxl9RZ/tkSFLuz+lrUgXSp3xm/T84R0w+1cPlbUhfcB+xTSJ9UHexo MyYGqxHE8r8n89OeWKz6BuDpLF0rV0ioS7RLuP+LnHfG44BvYdQD9nt3S4BC3JfGpnGX nJQWJTRHU1O+BZKaCUKxmLMhTObS3bAmDPehEI8RoxUhKvkgR0Sn6x++ygR0qQMkJYpd ZDng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=jbNETFuc; 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 r14-20020a05640251ce00b0047cf2d292b8si26082116edd.559.2023.01.02.02.52.28; Mon, 02 Jan 2023 02:52:51 -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=jbNETFuc; 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 S232439AbjABKvn (ORCPT + 99 others); Mon, 2 Jan 2023 05:51:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52436 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232643AbjABKvN (ORCPT ); Mon, 2 Jan 2023 05:51:13 -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 0E05062F2; Mon, 2 Jan 2023 02:50:53 -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 95C3860F2F; Mon, 2 Jan 2023 10:50:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 82E3AC43442; 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=lCnlWTz7E2JT4DsGGsbUN7wr3y738SvPqozHAINwpoA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jbNETFuc5HXKLMyoVazu/4FhPND8PQ9dLi8Qd4l/Sxjay0tr960z9OkubYQ1968IL YkXh/3tNYJlakdMuyWk7lJvrFBmMoC6jhZdTWIzHGRyjtLqrhregv1Y82c82ORGebN I1Tfq37XX1B6zG/cPNwjdbtr2Hv8dsoQ5BmyQqcvSIFx/w4pknBTb28pwD39hCSMfW TP/5uUVAVsPkxdbgLL3MUGUMYLE7+rSiePbuV56dwKEKFOLgyg68SPtbiOPVppkWGA i44g3lC6mXepHtRBT+1dBJHzSeMjs+tRAKwwq4aeKUjpERRtPwwzo2Iyrj4wqwgaho typQjxsCXKibw== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1pCIPM-000270-H5; Mon, 02 Jan 2023 11:51:08 +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 5/6] arm64: dts: qcom: sm8250-mtp: fix wcd938x codec node Date: Mon, 2 Jan 2023 11:50:37 +0100 Message-Id: <20230102105038.8074-6-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 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?1753907746960692550?= X-GMAIL-MSGID: =?utf-8?q?1753907746960692550?= 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. Signed-off-by: Johan Hovold --- 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 3ed8c84e25b8..ea43dbdc3671 100644 --- a/arch/arm64/boot/dts/qcom/sm8250-mtp.dts +++ b/arch/arm64/boot/dts/qcom/sm8250-mtp.dts @@ -23,6 +23,25 @@ aliases { serial0 = &uart12; }; + wcd938x: 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>; + 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>; + }; + chosen { stdout-path = "serial0:115200n8"; }; @@ -631,27 +650,6 @@ &slpi { firmware-name = "qcom/sm8250/slpi.mbn"; }; -&soc { - wcd938x: 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>; - 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"; From patchwork Mon Jan 2 10:50: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: 38081 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4106655wrt; Mon, 2 Jan 2023 02:52:51 -0800 (PST) X-Google-Smtp-Source: AMrXdXtP2ANzPmR+z1Qrb+PgkMF0KBxqhQjk8nB0a0AZNJhL3kVOa1dl/HbzwV1WxPIwZysJSUjU X-Received: by 2002:a62:b401:0:b0:580:9e9e:c442 with SMTP id h1-20020a62b401000000b005809e9ec442mr35951512pfn.24.1672656771638; Mon, 02 Jan 2023 02:52:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672656771; cv=none; d=google.com; s=arc-20160816; b=vZZjiROXSv4l1z+rbAhXvOELijTfAtkempv7Ltxfuqwpq96worCYsiRUP23YFdOCZ4 PJepowrrsjiaIda/o94OsaX1Puz6d263+3xOn6Pgj4gRzAYmsI+yJzb68OjOfBf8d74p +PG0hdGEZnkY4hBPZbHDqJfedOLyUAtPQDyr7Mqm75E+pruCvKyw8k/Ni2QLKI1pY9tE oYH1YDgEwg2nS213I0n1DBQtuvFL1C6uuY0HVPG3M/NCD23/eLyC8jI62U5uBllHaKta KVayKSIoHHVjD54WOMtUgIuyeLtFHjcoGST0FRDB6/fa5MEgEo+bvfA7SyqHX3hOdQuC 0jow== 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=riFowittTsHwSWgNwjmwKzxl4RBwjzKx1Nzks7zO9ug=; b=uirF5X2EdODiKAn8Vm6iRJ26ZFeOYsgGB2GkkViu8EcnnmhnbnNu47O9hhcI/ioCAr FiOegu7t2zIts1T3UpdZkIWyDJnnNmqZ1EdVbHtIDahVKIFu+XzXcYwBgX+eXv1lpWVa NO+pTBV6NVYf81xjjqLEE+IOHwCpNlo+KYzKx6wULU7Whsime5xQU8WEHPDwpyRob8Ai YSzSIU1MdHK2HrqOY1rYNEqWfb9mamob45i1v5zp/y0f3lxzh33IwlG44o7gznLQ2V9+ yxxdaGLtSGQDvjY0huZv4bSvEBbnpbTlEGIe7FioafLVBn1pmWrsO8xx6LSGYmxSeHFW RCVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=R9XUZ6Dl; 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 u11-20020a056a00098b00b0056b8ae6149csi30283035pfg.244.2023.01.02.02.52.39; Mon, 02 Jan 2023 02:52:51 -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=R9XUZ6Dl; 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 S232647AbjABKvu (ORCPT + 99 others); Mon, 2 Jan 2023 05:51:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52458 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232657AbjABKvO (ORCPT ); Mon, 2 Jan 2023 05:51:14 -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 5404962E2; Mon, 2 Jan 2023 02:50:54 -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 D7047B80D07; Mon, 2 Jan 2023 10:50:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 82C12C433B3; 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=NnSjzogFraldpT+XgAkjYumPBRSVym0mp3juRqkdBpI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R9XUZ6DlHPc+bBa0ForStYZhT5tJwdXf/wFRBVQ5wdWU+fYlbl5yISWRi5rxUKSBD M6jiVrGmjr3TIORGvzU+BHTsZLJdbWelF2azHeNme6dc0lY+SiV/6ner5FlG/VbY2L tR40DLeW4viM5CNAn22sOvh85Kp1DHUxk60kQsLD0Wq7GAB+SArbcXJhV8WJnE9PfD 8RX1ee7JEDXEhC5GswkxemVwGaDvZAbLTZLe4HcBligs7MzVWyPX9dGI3oeTqBCzeo nJCY7d+blk0TCw84twVzigMjo53JkEVAqDSP/lcxum4kUANFpeImylqiWmwnUfCC6Y NXdcD8B2XUWzg== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1pCIPM-000273-Jl; Mon, 02 Jan 2023 11:51:08 +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 6/6] arm64: dts: qcom: sm8450-hdk: fix wcd938x codec node Date: Mon, 2 Jan 2023 11:50:38 +0100 Message-Id: <20230102105038.8074-7-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 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?1753907747180181818?= X-GMAIL-MSGID: =?utf-8?q?1753907747180181818?= 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. Signed-off-by: Johan Hovold --- arch/arm64/boot/dts/qcom/sm8450-hdk.dts | 52 ++++++++++++------------- 1 file changed, 25 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..217b2c654745 100644 --- a/arch/arm64/boot/dts/qcom/sm8450-hdk.dts +++ b/arch/arm64/boot/dts/qcom/sm8450-hdk.dts @@ -17,6 +17,31 @@ aliases { serial0 = &uart7; }; + 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>; + }; + chosen { stdout-path = "serial0:115200n8"; }; @@ -407,33 +432,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";