From patchwork Wed Dec 13 16:25:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 178212 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:3b04:b0:fb:cd0c:d3e with SMTP id c4csp7949630dys; Wed, 13 Dec 2023 09:42:53 -0800 (PST) X-Google-Smtp-Source: AGHT+IH/D0SFmHtNFljDeCfMiB3PZ1LzizR3zfG5teaMlhXxXOhqfvSAhkyOZ8iAP/TfSbIz34jL X-Received: by 2002:a05:6e02:160a:b0:35d:7eee:5662 with SMTP id t10-20020a056e02160a00b0035d7eee5662mr7562933ilu.99.1702489372925; Wed, 13 Dec 2023 09:42:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702489372; cv=none; d=google.com; s=arc-20160816; b=DJIO9vB4jUw2VzKCCNU8Fkp5VxQgg1nfV40QcH6AweiKNHu8mCL9AxAN65DtesrDMk R5Ec6c85DgJ6jD5u9s+BqoYKcGAdYHCYsC+j2GbD0hqhaE+8n470F0wkeIc8zHqoOR9I 9MkpdqiXmCa5dDfDMDTxirohMaJQg5m0tYTkSTt/fZcQCFeoHowLorL+fHcfIO7fiJu1 rS7GzWwXzNSxgUdAiJadF7DnivOfBv1LROZu/UWaHjgFVm+hhXwViU1DZHQ/ZLJwOFQh lE9u+IJ1xR7XBMItBqwSPkzGzkJMWK6+mCdjIKrKg4oVrGtaek4fvFc3fEY0PgTAoB3/ A8yQ== 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=uDQI7CGNXE5QtDrGTA7vjhneNjlnGJyq3B8Gpd+RnjY=; fh=v1lwT2l/jVFCCowwT16E18rgIv0CDQo4TohtFL5maCY=; b=cDMGSUjusRPMfcKe1ijuURLZpkoXMApboIaZR78+TiUfW4WiiTyw/qHoamAl9ozCWf tJXBP750qBfak7dtRgoFRwV9u4LK53G9qXVqC/cqNV18yC9m6ZQAc/ltbwTsLZJKpDSO iZ5RKtxfPUZNAMUuFKiIK2+MRIOYVPhWW2Ycs7i3IopWiSRZX5L7ObGxerp8tz0v6A/B UJ9T0p+5yTiMN3DblotA09cAwfaXQePMNFL6PLg7adeV82i+NmYMi3ByClF78QJgiJHh PrRMxrkEdqI0qXQxez/XS3p95SPler0IKAiREkSztAgPti/1+7cfhwclcmS28hl5XWEX RQ2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MBrWmTLs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 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 morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id j4-20020a654304000000b005c677a35320si9547598pgq.479.2023.12.13.09.42.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 09:42:52 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MBrWmTLs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 39D97822B727; Wed, 13 Dec 2023 09:42:47 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378604AbjLMQZm (ORCPT + 99 others); Wed, 13 Dec 2023 11:25:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59830 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232912AbjLMQZh (ORCPT ); Wed, 13 Dec 2023 11:25:37 -0500 Received: from mail-lj1-x234.google.com (mail-lj1-x234.google.com [IPv6:2a00:1450:4864:20::234]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E310D93 for ; Wed, 13 Dec 2023 08:25:43 -0800 (PST) Received: by mail-lj1-x234.google.com with SMTP id 38308e7fff4ca-2cc259392a6so43700991fa.2 for ; Wed, 13 Dec 2023 08:25:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1702484742; x=1703089542; darn=vger.kernel.org; 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=uDQI7CGNXE5QtDrGTA7vjhneNjlnGJyq3B8Gpd+RnjY=; b=MBrWmTLsfVs9CMTTY1sUTDHbF4DlS8phTh8izquwAKAb+isBV8MzcPat9BUccNIBdK 6mLpuE+pSxCke3K+lPWq909tvGF9YMItP9ogpgViObCXbopakcBz6Ys3twOlgkXkb387 3Yl3yt/x0VSQ1gu0m3SbIJkv76LLgRzLmSIW51PXjjegzNB+fWGak78i+4qh7+JEev5s MBAXCnSLX8pqqe8tDc71mrpktjsXDv/Rd9csEwoa+sDsPsGK3nKcyUQ/PVOhM58E4eSa IOpp6Tct7qz+ULB7n3ie14DhvSG7sSnIckkH45ny7sw0TYuNcYrZ0YMjYbV2dW+AvS+B 2laQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702484742; x=1703089542; 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=uDQI7CGNXE5QtDrGTA7vjhneNjlnGJyq3B8Gpd+RnjY=; b=aESMmFCXk7d+c75gi3UXrbipe0ggX84tpvANKOfDchWMuytbWn5N1gtHz/zAOKS+PO IK3OlQrZpN2NnbZWLW6Elc4PDIPP32bwgXQTD8o+DKMT6vkZxhnFzeR6xsuUHv5eLHkd ZNOUUXPtuSD6Aht8HuC3XHAt58d/qMazpO0mLe/fBw2QchWPNHFGwq4/p9W7+StkuuGa j1CMVQisQjj+sHut2zoJWwOGGCNwJE7UMTBwds/6eeVZvAjGRdOX86iGSL0FQ0+DOwb1 ztM2oWhd/CSzEoY7eE2/JBtTSaqrmflbh6qX3Novv6zXum6eiSF/k6+JPFlIILh/peaD JltA== X-Gm-Message-State: AOJu0YzNPerpU1mADbyP15ydE2jKxCWaeEXUJUO2AKL1ZfvEkLoDSUKH 14VsuPhIfPjwzSIT1d7Dg+7gfw== X-Received: by 2002:a05:6512:401f:b0:50c:1d0e:5298 with SMTP id br31-20020a056512401f00b0050c1d0e5298mr4840221lfb.82.1702484742243; Wed, 13 Dec 2023 08:25:42 -0800 (PST) Received: from krzk-bin.. ([178.197.218.27]) by smtp.gmail.com with ESMTPSA id kv18-20020a17090778d200b00a1dfc541282sm8048914ejc.225.2023.12.13.08.25.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 08:25:41 -0800 (PST) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 2/2] arm64: dts: qcom: sm8550: move Soundwire pinctrl to its nodes Date: Wed, 13 Dec 2023 17:25:34 +0100 Message-Id: <20231213162536.171475-3-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231213162536.171475-1-krzysztof.kozlowski@linaro.org> References: <20231213162536.171475-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Wed, 13 Dec 2023 09:42:47 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785184702340822422 X-GMAIL-MSGID: 1785189496895822619 Pin configuration for Soundwire bus should be set in Soundwire controller nodes, not in the associated macro codec node. This placement change should not have big impact in general, because macro codec is a clock provider for Soundwire controller, thus its devices is probed first. However it will have impact for disabled Soundwire buses, e.g. WSA2, because after this change the pins will be left in default state. We also follow similar approach in newer SoCs, like Qualcomm SM8650. Signed-off-by: Krzysztof Kozlowski Acked-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sm8550.dtsi | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm8550.dtsi b/arch/arm64/boot/dts/qcom/sm8550.dtsi index 1f06fd33d1ce..d8f79b5895f5 100644 --- a/arch/arm64/boot/dts/qcom/sm8550.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8550.dtsi @@ -2050,8 +2050,6 @@ lpass_wsa2macro: codec@6aa0000 { #clock-cells = <0>; clock-output-names = "wsa2-mclk"; - pinctrl-names = "default"; - pinctrl-0 = <&wsa2_swr_active>; #sound-dai-cells = <1>; }; @@ -2063,6 +2061,9 @@ swr3: soundwire-controller@6ab0000 { clock-names = "iface"; label = "WSA2"; + pinctrl-0 = <&wsa2_swr_active>; + pinctrl-names = "default"; + qcom,din-ports = <4>; qcom,dout-ports = <9>; @@ -2096,8 +2097,6 @@ lpass_rxmacro: codec@6ac0000 { #clock-cells = <0>; clock-output-names = "mclk"; - pinctrl-names = "default"; - pinctrl-0 = <&rx_swr_active>; #sound-dai-cells = <1>; }; @@ -2109,6 +2108,9 @@ swr1: soundwire-controller@6ad0000 { clock-names = "iface"; label = "RX"; + pinctrl-0 = <&rx_swr_active>; + pinctrl-names = "default"; + qcom,din-ports = <1>; qcom,dout-ports = <11>; @@ -2142,8 +2144,6 @@ lpass_txmacro: codec@6ae0000 { #clock-cells = <0>; clock-output-names = "mclk"; - pinctrl-names = "default"; - pinctrl-0 = <&tx_swr_active>; #sound-dai-cells = <1>; }; @@ -2161,8 +2161,6 @@ lpass_wsamacro: codec@6b00000 { #clock-cells = <0>; clock-output-names = "mclk"; - pinctrl-names = "default"; - pinctrl-0 = <&wsa_swr_active>; #sound-dai-cells = <1>; }; @@ -2174,6 +2172,9 @@ swr0: soundwire-controller@6b10000 { clock-names = "iface"; label = "WSA"; + pinctrl-0 = <&wsa_swr_active>; + pinctrl-names = "default"; + qcom,din-ports = <4>; qcom,dout-ports = <9>; @@ -2203,6 +2204,9 @@ swr2: soundwire-controller@6d30000 { clock-names = "iface"; label = "TX"; + pinctrl-0 = <&tx_swr_active>; + pinctrl-names = "default"; + qcom,din-ports = <4>; qcom,dout-ports = <0>; qcom,ports-sinterval-low = /bits/ 8 <0x01 0x01 0x03 0x03>;