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: 13087353 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A9311C4708E for ; Tue, 3 Jan 2023 10:31:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237019AbjACKbl (ORCPT ); Tue, 3 Jan 2023 05:31:41 -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 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org 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: 13087358 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17812C4708E for ; Tue, 3 Jan 2023 10:31:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237145AbjACKbo (ORCPT ); Tue, 3 Jan 2023 05:31:44 -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 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org 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: 13087356 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0843DC3DA7D for ; Tue, 3 Jan 2023 10:31:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233036AbjACKbn (ORCPT ); Tue, 3 Jan 2023 05:31:43 -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 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org 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: 13087359 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1403DC3DA7D for ; Tue, 3 Jan 2023 10:31:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236903AbjACKbq (ORCPT ); Tue, 3 Jan 2023 05:31:46 -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 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org 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: 13087357 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 33044C54EBE for ; Tue, 3 Jan 2023 10:31:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237177AbjACKbp (ORCPT ); Tue, 3 Jan 2023 05:31:45 -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 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org 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: 13087354 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 38397C53210 for ; Tue, 3 Jan 2023 10:31:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237108AbjACKbm (ORCPT ); Tue, 3 Jan 2023 05:31:42 -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 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org 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 {