From patchwork Sat Dec 10 11:57:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 32019 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp1273997wrr; Sat, 10 Dec 2022 04:04:16 -0800 (PST) X-Google-Smtp-Source: AA0mqf7WLO/99o9hyhfKRVCOfu96fWoTDX1TW/fFwuLz+qWSZXZPRlJTgby1xS85KBIyuqMmg3C/ X-Received: by 2002:a17:907:2994:b0:7c0:e535:13fd with SMTP id eu20-20020a170907299400b007c0e53513fdmr6581027ejc.70.1670673856154; Sat, 10 Dec 2022 04:04:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670673856; cv=none; d=google.com; s=arc-20160816; b=LbwFcWeNUu2FC0GPKlIXsJK+1CPoeTsHVCm0WnEus5qRlHGVN/EtSwyqpC88yb82my ONFEOJokZi0ptf+i4UCUj7LpKRHG3cxG3gFTsR938WQRV6eCDQhvGGVdcC2TThpJ/v0I vaQ/uVHmsDlpl6/wup712gWPlCXWNFlqPIb2OWuskGj6Ws1+SdO+9nZyTJxXgJkQGj+s EA25SHiWGnnnhqcGvJ1TDc+J5tAWRfuLD65SNNNeFgy3XFU3jb/tbRNFMkRQT0yfE1VP mVcAWCiVmwZMq0n5TYherrGanyZZqFvsx12bppx7EVGwop1kg+xfz3v0dOypQe+3HQ/u fL/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=2aKGT7tvm+U766DlUeQvJkK/b6wDdJYC7cAMniFsjLY=; b=pcOlPIGF3xlh1+4dwIG0LKm9z23vUs3w7S0aJKaz/tvX2rF33mPWGBcCVeYr6scU3u EU3ZFW1V/uGLifS+oRcdUwTFUnIIQSdwDikuA/boMtHTWN3bDmfYs4lMUO2WzfjVq5IK t8N6i5/n7zatylRTuIiEtpOp8KlImotqWhURLsKkxYIv0cSsS4qya2dZVnV1dtCRhk7A kh0oQ816gyO55ZgQx5YSBMjNoLlcA7nz6A5+fD9Yk3y2TzKbhfAsTC5xeZQIx513A3V/ YsdIYXovDo4aTb+KvO/IaojU81pzfXgWc25e48S8LwX27dwT30hwkEVoruRJD0KReT8L GHGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=sGcZyKf2; 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=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e9-20020a170906080900b0078db6f56d51si1654018ejd.808.2022.12.10.04.03.50; Sat, 10 Dec 2022 04:04:16 -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=@linaro.org header.s=google header.b=sGcZyKf2; 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=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229853AbiLJL5X (ORCPT + 99 others); Sat, 10 Dec 2022 06:57:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35716 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229822AbiLJL5Q (ORCPT ); Sat, 10 Dec 2022 06:57:16 -0500 Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ACC15192B8 for ; Sat, 10 Dec 2022 03:57:13 -0800 (PST) Received: by mail-lf1-x134.google.com with SMTP id y25so11035933lfa.9 for ; Sat, 10 Dec 2022 03:57:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2aKGT7tvm+U766DlUeQvJkK/b6wDdJYC7cAMniFsjLY=; b=sGcZyKf2v871JJabnGjzz5G2LGfTbsnyH9ThYrjJOSD0YFCF1BKxYVVZaDtA0JkO9Z RHvziHlT2PJlKCnTZxk+NIAmn+XDfnM+9NYfMnCX2MnGkioCQwLrifkbsWhaHI2k6RRO qHUj6ZmvYW+4oAdi4sSdor0PBEi2NI7zQohHcr8n2q+lCjZk3FmbqGiNIugcMff2Fu5v HYniOkmyBWtltL2jHYFksYyqNFHNC9nXDElwEhdCGftFTyh5pyqxorYYxGrbAUykuovK 5Pl6zS96n1a1nJwv5qU6nqpS5u5Li5eC0rZEy4xP2lPftl3WAa21d9r1soxp1tymLCl6 Ufgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2aKGT7tvm+U766DlUeQvJkK/b6wDdJYC7cAMniFsjLY=; b=daiAzEKVQ8uoQJfR3Mb+1A5hQa8Y0eUIP9CxNZgf31oJo+YI1zydOHKGY0fK3wd8Ct xy0+fRI2jGx7EdEMPE3VCQiClUK+tI0y46H+7lIn+t7+J0+XbSIhRbSVVIeXjxsQM9vp IIkY/a1Ykpioc50r4GlZ/UQ1wz1f1WUffvU/M2fu9tjQCDJ8cSg3d+0/0Y+tHKkXI5t9 vD+VU7Vj+LNNDq8x3kmJLJA+tXwpg4fJUgDW4GtYVSkgLamp+dq85V0lQFcoz5xbzynv 8r8exmttn/tv31MC2yrTxMbyCL8CLKpvC3YPy/hvAYrO61bZA/gVecoGRU8k1qd9FtL5 +4DQ== X-Gm-Message-State: ANoB5pkU2rkO2Vh31wVg1ztNWFZK1+lp2SpKobLBhIcBO/zunMXdZ7Xp +3ocY+LwIkTKYS9bZ2Y7EP2L8Q== X-Received: by 2002:ac2:4305:0:b0:4b0:25f9:14ea with SMTP id l5-20020ac24305000000b004b025f914eamr1985735lfh.21.1670673431731; Sat, 10 Dec 2022 03:57:11 -0800 (PST) Received: from krzk-bin.NAT.warszawa.vectranet.pl (088156142067.dynamic-2-waw-k-3-2-0.vectranet.pl. [88.156.142.67]) by smtp.gmail.com with ESMTPSA id u20-20020a2eb814000000b002778d482800sm578343ljo.59.2022.12.10.03.57.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Dec 2022 03:57:11 -0800 (PST) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski Cc: Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/4] arm64: dts: qcom: sm8250: move sound and codec nodes out of soc Date: Sat, 10 Dec 2022 12:57:04 +0100 Message-Id: <20221210115704.97614-4-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221210115704.97614-1-krzysztof.kozlowski@linaro.org> References: <20221210115704.97614-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, 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?1751828509277929022?= X-GMAIL-MSGID: =?utf-8?q?1751828509277929022?= The sound and codec nodes are not a property of a soc, but rather board as it describes the sound configuration. It also does not have unit address: sm8250-hdk.dtb: soc@0: sound: {} should not be valid under {'type': 'object'} Signed-off-by: Krzysztof Kozlowski Reviewed-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 40 ++++++++++++------------- arch/arm64/boot/dts/qcom/sm8250.dtsi | 6 ++-- 2 files changed, 22 insertions(+), 24 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm8250-mtp.dts b/arch/arm64/boot/dts/qcom/sm8250-mtp.dts index 3ed8c84e25b8..b741b7da1afc 100644 --- a/arch/arm64/boot/dts/qcom/sm8250-mtp.dts +++ b/arch/arm64/boot/dts/qcom/sm8250-mtp.dts @@ -27,6 +27,25 @@ chosen { stdout-path = "serial0:115200n8"; }; + 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>; + }; + thermal-zones { camera-thermal { polling-delay-passive = <0>; @@ -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"; diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi index d517d6a80bdc..fbbbae29e0c2 100644 --- a/arch/arm64/boot/dts/qcom/sm8250.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi @@ -2826,9 +2826,6 @@ compute-cb@8 { }; }; - sound: sound { - }; - usb_1_hsphy: phy@88e3000 { compatible = "qcom,sm8250-usb-hs-phy", "qcom,usb-snps-hs-7nm-phy"; @@ -4910,6 +4907,9 @@ cpufreq_hw: cpufreq@18591000 { }; }; + sound: sound { + }; + timer { compatible = "arm,armv8-timer"; interrupts =