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";