From patchwork Fri Jan 13 16:22:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 642173 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 8E9DBC67871 for ; Fri, 13 Jan 2023 16:28:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229639AbjAMQ2q (ORCPT ); Fri, 13 Jan 2023 11:28:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44162 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229979AbjAMQ2R (ORCPT ); Fri, 13 Jan 2023 11:28:17 -0500 Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AF07A7FC8A for ; Fri, 13 Jan 2023 08:22:51 -0800 (PST) Received: by mail-ej1-x631.google.com with SMTP id u9so53528125ejo.0 for ; Fri, 13 Jan 2023 08:22:51 -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=7d41l0HM2BfF3mxFfhv8kgpjTHwRckZQ3XW8jzXEKtA=; b=djioHbVFvUz5qObOlYiGdTQALHhMYuwE/IMrkCTY51GlXpqU0Jf1lCUkAXYKBi292o rXVpN/kFyEU9DT79ZrY3AZsBcDamrRqdSv7thn7OpU4gMh9ECOnVZE1Wtpj0KRXOi4Cl CXxZtotfZVoQTK9soDEdwVYefGn/j1lXCyZ86ZeRhxBV3cq73uFHGIxXKXPX+5I84+hU kN0CXcnhXxJjOnhbAxiV9NNNh9BS310S4dRiC3FG0+nMPyGyo+6ogIA3wBCWNfdel9/9 RPPxxNciVd/fWYM8v/O9Zt6dxglRxPzsNvyj0D8t+CHgOj96vAqpHSdaJwqyoLpzALIw BAXg== 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=7d41l0HM2BfF3mxFfhv8kgpjTHwRckZQ3XW8jzXEKtA=; b=QtV91teSj5MuWoA/HI5CyK8yiUZp4fUGY+WcU0+/tOMPWYxVQXqAKXS8/QDuXHij44 8f7K2CnsJBC/TjjgSeaoWZohe0B8ucM9hF4lSQE4wFHtXaZBlXzZraqZXypPBmIeJaTT Zazz8iLwyjVnxE3NJjgz5M/2ixSdD/czN+OU8m6rvkDYxhBTHivYhs1DbgI7z0bX04vw 2RslMBSgo9QyxFIHEIUSIdmJDpzwRCtbmy4IyyHZZQ8VsSqDSvCtdHdfDu0tjkbqG1Wt IxPEaMaBT4vqgVo7iBMpo/J8KII3DTuvRxtru3rHzsUhQY+tDJF13pIbvDvFVTYtMx99 /h6A== X-Gm-Message-State: AFqh2krlBzL5sjxZ7fOsjZQEyuSZ1g27wYQVFDUgU7RVYcnJX/MG2mug Px9zyore0o5DiWG04itj2Vyvuw== X-Google-Smtp-Source: AMrXdXtTUjoz3dWiA0ZESis4pRBEtW4cYZ+lfJFUZ/DDZIZdwyn9tSNRE/YzZO7FQ1+XiPg7Sq5qzw== X-Received: by 2002:a17:906:a186:b0:82d:e2a6:4b0d with SMTP id s6-20020a170906a18600b0082de2a64b0dmr67249105ejy.18.1673626970314; Fri, 13 Jan 2023 08:22:50 -0800 (PST) Received: from krzk-bin.. ([178.197.216.144]) by smtp.gmail.com with ESMTPSA id q1-20020a17090676c100b007c0d4d3a0c1sm8739479ejn.32.2023.01.13.08.22.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Jan 2023 08:22:50 -0800 (PST) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 2/6] arm64: dts: qcom: sdm845: move WCD9340 codec to separate file Date: Fri, 13 Jan 2023 17:22:41 +0100 Message-Id: <20230113162245.117324-2-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230113162245.117324-1-krzysztof.kozlowski@linaro.org> References: <20230113162245.117324-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org WCD9340 codec node is not a property of the SoC, but board. Move it to separate file and include it in the specific boards. On all others, keep the Slimbus node disabled as it is empty. Signed-off-by: Krzysztof Kozlowski --- .../boot/dts/qcom/sdm845-audio-wcd9340.dtsi | 69 +++++++++++++++++++ arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 1 + .../qcom/sdm845-xiaomi-beryllium-common.dtsi | 1 + .../boot/dts/qcom/sdm845-xiaomi-polaris.dts | 1 + arch/arm64/boot/dts/qcom/sdm845.dtsi | 60 +--------------- .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 1 + .../boot/dts/qcom/sdm850-samsung-w737.dts | 1 + 7 files changed, 75 insertions(+), 59 deletions(-) create mode 100644 arch/arm64/boot/dts/qcom/sdm845-audio-wcd9340.dtsi diff --git a/arch/arm64/boot/dts/qcom/sdm845-audio-wcd9340.dtsi b/arch/arm64/boot/dts/qcom/sdm845-audio-wcd9340.dtsi new file mode 100644 index 000000000000..5bcce7d0d709 --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sdm845-audio-wcd9340.dtsi @@ -0,0 +1,69 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * SDM845 SoC device tree source + * + * Copyright (c) 2018, The Linux Foundation. All rights reserved. + */ + +&slim { + status = "okay"; + + slim@1 { + reg = <1>; + #address-cells = <2>; + #size-cells = <0>; + + wcd9340_ifd: ifd@0,0 { + compatible = "slim217,250"; + reg = <0 0>; + }; + + wcd9340: codec@1,0 { + compatible = "slim217,250"; + reg = <1 0>; + slim-ifc-dev = <&wcd9340_ifd>; + + #sound-dai-cells = <1>; + + interrupts-extended = <&tlmm 54 IRQ_TYPE_LEVEL_HIGH>; + interrupt-controller; + #interrupt-cells = <1>; + + #clock-cells = <0>; + clock-frequency = <9600000>; + clock-output-names = "mclk"; + qcom,micbias1-microvolt = <1800000>; + qcom,micbias2-microvolt = <1800000>; + qcom,micbias3-microvolt = <1800000>; + qcom,micbias4-microvolt = <1800000>; + + #address-cells = <1>; + #size-cells = <1>; + + wcdgpio: gpio-controller@42 { + compatible = "qcom,wcd9340-gpio"; + gpio-controller; + #gpio-cells = <2>; + reg = <0x42 0x2>; + }; + + swm: swm@c85 { + compatible = "qcom,soundwire-v1.3.0"; + reg = <0xc85 0x40>; + interrupts-extended = <&wcd9340 20>; + + qcom,dout-ports = <6>; + qcom,din-ports = <2>; + qcom,ports-sinterval-low = /bits/ 8 <0x07 0x1f 0x3f 0x7 0x1f 0x3f 0x0f 0x0f>; + qcom,ports-offset1 = /bits/ 8 <0x01 0x02 0x0c 0x6 0x12 0x0d 0x07 0x0a>; + qcom,ports-offset2 = /bits/ 8 <0x00 0x00 0x1f 0x00 0x00 0x1f 0x00 0x00>; + + #sound-dai-cells = <1>; + clocks = <&wcd9340>; + clock-names = "iface"; + #address-cells = <2>; + #size-cells = <0>; + }; + }; + }; +}; diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts index 6b355589edb3..3726465acbde 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts @@ -11,6 +11,7 @@ #include #include #include "sdm845.dtsi" +#include "sdm845-audio-wcd9340.dtsi" #include "pm8998.dtsi" #include "pmi8998.dtsi" diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi index 64de4ed9b0c8..e530a676b250 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi @@ -7,6 +7,7 @@ #include #include #include "sdm845.dtsi" +#include "sdm845-audio-wcd9340.dtsi" #include "pm8998.dtsi" #include "pmi8998.dtsi" diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts index a80c3dd9a2da..f81619c8a3ba 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts @@ -13,6 +13,7 @@ #include #include #include "sdm845.dtsi" +#include "sdm845-audio-wcd9340.dtsi" #include "pm8998.dtsi" #include "pmi8998.dtsi" #include "pm8005.dtsi" diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi index 4c256431280a..f9b1d7a60fd6 100644 --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi @@ -3831,65 +3831,7 @@ slim: slim-ngd@171c0000 { iommus = <&apps_smmu 0x1806 0x0>; #address-cells = <1>; #size-cells = <0>; - - slim@1 { - reg = <1>; - #address-cells = <2>; - #size-cells = <0>; - - wcd9340_ifd: ifd@0,0 { - compatible = "slim217,250"; - reg = <0 0>; - }; - - wcd9340: codec@1,0 { - compatible = "slim217,250"; - reg = <1 0>; - slim-ifc-dev = <&wcd9340_ifd>; - - #sound-dai-cells = <1>; - - interrupts-extended = <&tlmm 54 IRQ_TYPE_LEVEL_HIGH>; - interrupt-controller; - #interrupt-cells = <1>; - - #clock-cells = <0>; - clock-frequency = <9600000>; - clock-output-names = "mclk"; - qcom,micbias1-microvolt = <1800000>; - qcom,micbias2-microvolt = <1800000>; - qcom,micbias3-microvolt = <1800000>; - qcom,micbias4-microvolt = <1800000>; - - #address-cells = <1>; - #size-cells = <1>; - - wcdgpio: gpio-controller@42 { - compatible = "qcom,wcd9340-gpio"; - gpio-controller; - #gpio-cells = <2>; - reg = <0x42 0x2>; - }; - - swm: swm@c85 { - compatible = "qcom,soundwire-v1.3.0"; - reg = <0xc85 0x40>; - interrupts-extended = <&wcd9340 20>; - - qcom,dout-ports = <6>; - qcom,din-ports = <2>; - qcom,ports-sinterval-low = /bits/ 8 <0x07 0x1f 0x3f 0x7 0x1f 0x3f 0x0f 0x0f>; - qcom,ports-offset1 = /bits/ 8 <0x01 0x02 0x0c 0x6 0x12 0x0d 0x07 0x0a>; - qcom,ports-offset2 = /bits/ 8 <0x00 0x00 0x1f 0x00 0x00 0x1f 0x00 0x00>; - - #sound-dai-cells = <1>; - clocks = <&wcd9340>; - clock-names = "iface"; - #address-cells = <2>; - #size-cells = <0>; - }; - }; - }; + status = "disabled"; }; lmh_cluster1: lmh@17d70800 { diff --git a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts index d9581f4440b3..5586c95aa1ff 100644 --- a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts +++ b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts @@ -13,6 +13,7 @@ #include #include #include "sdm850.dtsi" +#include "sdm845-audio-wcd9340.dtsi" #include "pm8998.dtsi" /* diff --git a/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts b/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts index 6730804f4e3e..40223704a2c7 100644 --- a/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts +++ b/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts @@ -14,6 +14,7 @@ #include #include #include "sdm850.dtsi" +#include "sdm845-audio-wcd9340.dtsi" #include "pm8998.dtsi" /* From patchwork Fri Jan 13 16:22:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 642172 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 3819AC678D8 for ; Fri, 13 Jan 2023 16:28:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229772AbjAMQ2s (ORCPT ); Fri, 13 Jan 2023 11:28:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44218 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230003AbjAMQ2U (ORCPT ); Fri, 13 Jan 2023 11:28:20 -0500 Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [IPv6:2a00:1450:4864:20::530]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 94AF48099C for ; Fri, 13 Jan 2023 08:22:54 -0800 (PST) Received: by mail-ed1-x530.google.com with SMTP id 18so31821175edw.7 for ; Fri, 13 Jan 2023 08:22:54 -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=9WqL6KCJ/Vj1K3Gwygg8uoJ29qI2425hp2cgj9g3I38=; b=hMds/y4P89Fz5T91QTHQ0HMIGuo1G+F1uCW4tA9HBiVj7MQE898SGHNSYkAHSDWuWu xYgm9yvgKrTV0PRRWsCqm9ePDULwsJzkmEELJIzHStAPt+tr4G8OZ3FrXdXNuaNMw87Y 6mZTE34ZXebLq0od9dF5A5yJo2oWDh7lq0l7bJDis2hi7sBjPE+HG1jwOpUKjyPcDzHP jTe112U1OXwKew94Um+qUFkPGC9H0fRcbxHxj7LKxmGoEMkOrFVTM1s3tGugWOxKvVWi 4My92qPtIV8cSYL2SxEu6ZYdpRrztLKczFC2acPyoskhtdJ0i3MiS8qp0pmS1u8wM9S5 xBnQ== 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=9WqL6KCJ/Vj1K3Gwygg8uoJ29qI2425hp2cgj9g3I38=; b=GRkgsngPCHwIxp5eb2AirpA41CGO6s+10RDks8ilaGhnDzRGjNXLxaV00FdWSPTnLy 4f2L1CgSRvH8SOcZRAp229r8jAmYeAx0bZ4eya8qjYHI4k5DNGHz77/mqfcFR8saWk56 Q667uBUaTtUDhGxVX4yrZC0KG6j2Xs51uXT8361wwinDI58w9/LThS8asRpVEnsGui8F +kjLq3ftF/pbe7J36twscWuDjaEXJvoESgqVzPIrouK1HBYQBMGDsobi3XK4+rlM7fUL pelbkewK5vdLGY54Bg9+HJFhYUriNodd6Shje/EWKsRMOwPDXBNphM7mT0pZ7kgqVdgV UC8Q== X-Gm-Message-State: AFqh2krzXxJbj4RBeg1HfbN1HIdCzB18qD8rSeqN3EoReCAPzVYLaf7G LFpsLKKCN8jgyv3Eek5lM7lFoA== X-Google-Smtp-Source: AMrXdXvD5o6MQYQiQ+iEJZtZtbshjXm3q6U6pitxrH1sPjseNSgkryJDnY/JQqk+0SHDP3Bxpbu6Ag== X-Received: by 2002:aa7:c1d9:0:b0:499:1ed2:645d with SMTP id d25-20020aa7c1d9000000b004991ed2645dmr17216781edp.17.1673626973192; Fri, 13 Jan 2023 08:22:53 -0800 (PST) Received: from krzk-bin.. ([178.197.216.144]) by smtp.gmail.com with ESMTPSA id q1-20020a17090676c100b007c0d4d3a0c1sm8739479ejn.32.2023.01.13.08.22.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Jan 2023 08:22:52 -0800 (PST) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 4/6] arm64: dts: qcom: sdm845-audio-wcd9340: commonize clocks Date: Fri, 13 Jan 2023 17:22:43 +0100 Message-Id: <20230113162245.117324-4-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230113162245.117324-1-krzysztof.kozlowski@linaro.org> References: <20230113162245.117324-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Clock for WCD9340 is coming from the SoC and is the same in all users, so move it to common file to reduce the code duplication (which still allows further customizations per board). Signed-off-by: Krzysztof Kozlowski Reviewed-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sdm845-audio-wcd9340.dtsi | 3 +++ arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 2 -- arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 2 -- arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts | 2 -- arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 2 -- arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts | 2 -- 6 files changed, 3 insertions(+), 10 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sdm845-audio-wcd9340.dtsi b/arch/arm64/boot/dts/qcom/sdm845-audio-wcd9340.dtsi index 33718cb95c83..0d7c37f39176 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-audio-wcd9340.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-audio-wcd9340.dtsi @@ -29,6 +29,9 @@ wcd9340: codec@1,0 { interrupt-controller; #interrupt-cells = <1>; + clock-names = "extclk"; + clocks = <&rpmhcc RPMH_LN_BB_CLK2>; + #clock-cells = <0>; clock-frequency = <9600000>; clock-output-names = "mclk"; diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts index 33ec79afbb62..9c9a587ea7a9 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts @@ -1076,8 +1076,6 @@ &venus { }; &wcd9340 { - clock-names = "extclk"; - clocks = <&rpmhcc RPMH_LN_BB_CLK2>; reset-gpios = <&tlmm 64 GPIO_ACTIVE_HIGH>; vdd-buck-supply = <&vreg_s4a_1p8>; vdd-buck-sido-supply = <&vreg_s4a_1p8>; diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi index a7a3f7ce2809..4f8ffc0da141 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi @@ -534,8 +534,6 @@ &venus { }; &wcd9340 { - clock-names = "extclk"; - clocks = <&rpmhcc RPMH_LN_BB_CLK2>; reset-gpios = <&tlmm 64 GPIO_ACTIVE_HIGH>; vdd-buck-supply = <&vreg_s4a_1p8>; vdd-buck-sido-supply = <&vreg_s4a_1p8>; diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts index 1ceeea0885b9..d9c4af06ab63 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts @@ -692,8 +692,6 @@ &venus { }; &wcd9340 { - clock-names = "extclk"; - clocks = <&rpmhcc RPMH_LN_BB_CLK2>; reset-gpios = <&tlmm 64 GPIO_ACTIVE_HIGH>; vdd-buck-sido-supply = <&vreg_s4a_1p8>; vdd-buck-supply = <&vreg_s4a_1p8>; diff --git a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts index f3dd0ff1d5c6..5094e7e6dc48 100644 --- a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts +++ b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts @@ -738,8 +738,6 @@ &venus { }; &wcd9340 { - clock-names = "extclk"; - clocks = <&rpmhcc RPMH_LN_BB_CLK2>; reset-gpios = <&tlmm 64 GPIO_ACTIVE_HIGH>; vdd-buck-supply = <&vreg_s4a_1p8>; vdd-buck-sido-supply = <&vreg_s4a_1p8>; diff --git a/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts b/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts index fc9369eafd23..65de8d595736 100644 --- a/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts +++ b/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts @@ -647,8 +647,6 @@ &venus { }; &wcd9340 { - clock-names = "extclk"; - clocks = <&rpmhcc RPMH_LN_BB_CLK2>; reset-gpios = <&tlmm 64 GPIO_ACTIVE_HIGH>; vdd-buck-supply = <&vreg_s4a_1p8>; vdd-buck-sido-supply = <&vreg_s4a_1p8>; From patchwork Fri Jan 13 16:22:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 642171 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 6877EC54EBD for ; Fri, 13 Jan 2023 16:28:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229525AbjAMQ2u (ORCPT ); Fri, 13 Jan 2023 11:28:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42704 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229942AbjAMQ2W (ORCPT ); Fri, 13 Jan 2023 11:28:22 -0500 Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B6EAC8142A for ; Fri, 13 Jan 2023 08:22:56 -0800 (PST) Received: by mail-ej1-x631.google.com with SMTP id u9so53528777ejo.0 for ; Fri, 13 Jan 2023 08:22:56 -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=Khdx3Ga85eCQb6IsMCjx6CynZpib1E9o545AtXQA2Fc=; b=ma3jG4N5B5obz0s2JVeNyEQIdR0S3Qr8HitCRFHWCXv+EP5PmijF5R6rartbKOGBVM u4T2VnKPd6BV0S9kNFWV6K1AeuwhnD7+mKeHvqqijcs1vC2dwRMad9OHguFvV19XzAM6 K5y1lcEEh29q0TxuCMVaAa5wRxQY9v+pQYb+EN7ZfTtfBd5A+ziJPM60LzHx2H9SMIqz M+HsHD15mX4Ie7OMr2oeCNvbmgHoXYpfvd8hLW215rjbrWQkxrVJ3aj+91kw2XueM2UC hoqw0ZAFNpjQrF0YHnuJv/zc7aNxJp7cAaqmeOVbX/mVofbEvLdXHRiSOqCs8lPqY6HE Cizg== 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=Khdx3Ga85eCQb6IsMCjx6CynZpib1E9o545AtXQA2Fc=; b=4wZlAjDEGSHkQOglSRv7una88KbhFer6/oWb9qqfiKxzOxeZWlCAAka5LwF/kdm0vT f80JfOaW2Lnmh1tlO8sv3O30gKnkW9OZ6nRFdi3T4AeiiNh8n/wD/S+kRLfe0hOKSVrj kfx6MSCLJSDK9eDt7kloxBa4NtsyUtViWbtoLfKRER1vf86a/+rJ5v3Tj1E0DujYkTi2 XCG9WXeuxFsRchcMsyGlgDSj+kv8IkyNA0BCowA7GSI5S1o2xn6gQvESnsod7n9UjKWf sx0hunLKvrFt1+xpmiyt9ozdNIFohWVfJkBgq/U4YSeCDqkZxmRCUsg2A93AYtdgtUn/ SFRg== X-Gm-Message-State: AFqh2ko7HsYHR06pAgiaH3looXzcrXs2+KfEHazHn/orMfUEoZvrKDQS 3RK/87iNl1E8dWqYxdIViI+dcN6enfoV50os X-Google-Smtp-Source: AMrXdXvCnqHQGC7HhNpBGI6RSDinwcsGecCbYlNsp2MP+CXZiXAXxUz7BwOnVYgyPjs+Rq3pKRCc8g== X-Received: by 2002:a17:907:88cd:b0:85c:dc1b:dfb0 with SMTP id rq13-20020a17090788cd00b0085cdc1bdfb0mr13422734ejc.47.1673626976344; Fri, 13 Jan 2023 08:22:56 -0800 (PST) Received: from krzk-bin.. ([178.197.216.144]) by smtp.gmail.com with ESMTPSA id q1-20020a17090676c100b007c0d4d3a0c1sm8739479ejn.32.2023.01.13.08.22.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Jan 2023 08:22:55 -0800 (PST) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 6/6] arm64: dts: qcom: sc8280xp: drop unused properties from tx-macro Date: Fri, 13 Jan 2023 17:22:45 +0100 Message-Id: <20230113162245.117324-6-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230113162245.117324-1-krzysztof.kozlowski@linaro.org> References: <20230113162245.117324-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org tx-macro does not have children and does not allow address/size cells: sc8280xp-crd.dtb: txmacro@3220000: Unevaluated properties are not allowed ('#address-cells', '#size-cells' were unexpected) Signed-off-by: Krzysztof Kozlowski 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 5f2bb35a39bf..4986db9d35ad 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi +++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi @@ -1788,8 +1788,6 @@ txmacro: txmacro@3220000 { clock-output-names = "mclk"; #clock-cells = <0>; - #address-cells = <2>; - #size-cells = <2>; #sound-dai-cells = <1>; };