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: 638799 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: 638800 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: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: 638801 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 {