From patchwork Wed Dec 13 16:28:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 178153 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:3b04:b0:fb:cd0c:d3e with SMTP id c4csp7898781dys; Wed, 13 Dec 2023 08:29:12 -0800 (PST) X-Google-Smtp-Source: AGHT+IEjVOtyt+yjMIX9F26hGDw8ERo7N5gJ0OHEqxRhZ+JEV4yfyiKz7Bb0RSLRFxRjkiY7MC8u X-Received: by 2002:a05:6e02:148d:b0:35d:5d94:ee4c with SMTP id n13-20020a056e02148d00b0035d5d94ee4cmr13246842ilk.67.1702484952532; Wed, 13 Dec 2023 08:29:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702484952; cv=none; d=google.com; s=arc-20160816; b=P+DYOuG8C9wI5S8o6uTUJOJGLUGl8nay+g9ey4hxksPfV8RnyVePWt5imuOyavHN82 LxwGYV2/5fUSGng4HMRhgbcXFesu3PiFNkYQcgs5NFukKJ8DRZF0txxHi6WdYv/y6KGb zkTQFVA6Cs8+5sCIRu1K6H8P38RDB0WGwOPpYTtiCaIXxVanGK8pTI7J81nNcaZyxOM3 pbdxYICOSWmqy9KHXf/ZrTyrPFQacmSpyFuo9lHU2Ug2kaVb3byvB7WjoTGpgXfmbE/e ZZYT3NgDKm8xtQqCsfGxfTnN6RemQKkCddodaEXbieDvHyRlnVXwVYUyWLp22r1yP2eK 6Csg== 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=NEzLaoNa4BA2w8OvaI5sizwaYC3nqK5NDpqXu6xPo90=; fh=v1lwT2l/jVFCCowwT16E18rgIv0CDQo4TohtFL5maCY=; b=u/jAjF0pq4eI5MTcl+6cQjAaRCcxUQfRL6PYlmhquyDLXQapcIWcLdUvr3detWvx8W 2I1UIeAd1gW/U+eNpLCGtVLbhf9sGY0pk1h+wKsrk0ymvUlF3Tb6I2wZu+xcmyvCRPk+ dkm2fPu2VUgiLCUnktfulTpxJ//WmRJ2TrqszkmL8r9Bn2EG6/zDGoaG6G4CjR03eONP mfPx3PD6Vfna3JaiRcsvAIseVBzH8xH3eOmLnQxyXt53fE3pc3o0ywbyoVUzO3u0UVJP BtdcjKvPVTTfJZCeOxaT+ziviPIxoVu8Jrtgp72kDNzcQZ+MeIt5KSfMPUhsfSnkflZH NNrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EPaCDW3X; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id bv129-20020a632e87000000b005c6bdab9e58si9492083pgb.668.2023.12.13.08.29.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 08:29:12 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EPaCDW3X; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (Postfix) with ESMTP id F037D80309BC; Wed, 13 Dec 2023 08:29:10 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233620AbjLMQ3B (ORCPT + 99 others); Wed, 13 Dec 2023 11:29:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52110 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232736AbjLMQ3A (ORCPT ); Wed, 13 Dec 2023 11:29:00 -0500 Received: from mail-lf1-x12a.google.com (mail-lf1-x12a.google.com [IPv6:2a00:1450:4864:20::12a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0759993 for ; Wed, 13 Dec 2023 08:29:06 -0800 (PST) Received: by mail-lf1-x12a.google.com with SMTP id 2adb3069b0e04-50bf8843a6fso7015920e87.0 for ; Wed, 13 Dec 2023 08:29:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1702484944; x=1703089744; 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=NEzLaoNa4BA2w8OvaI5sizwaYC3nqK5NDpqXu6xPo90=; b=EPaCDW3X65pt9lfhQDirUMYk6SCoBK/3UDqFB0I/I4ffRoHzcZgU/2n/oE3Y8VJ1ST 09QWKkA3NX+8kwydIeMpnuL1Tic5bu6GdW32RMYHKCTFDkhcQu/uEya/clUz9upHQG36 vmY7SPwX7Dg65keGSow7WOFAk6MRnUrywU2g0RYMuEkXCa19Ku6luR09CVKDAz1cgsOA 9VKgkj5OJgXoBwPcrcrLNIJd34Ib3aoanBKNwsO5zaczD1lzxGUP84mSLx2VaA/mG8wA UHu5Am8ufx7NHpWmsY9wskoPFxCughn9IKmGm9fGnjq2IS9gsLcWY6zSzeJ59JIRZPUV Q3Qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702484944; x=1703089744; 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=NEzLaoNa4BA2w8OvaI5sizwaYC3nqK5NDpqXu6xPo90=; b=uF5OmfxNkPDqPl+z1QY89bHpsEAYLKYbNpCCLhhWk/vUQJMnl+xKAia1y2P2SvE1Ov L8f3wtcL+P0xm3vvPIT6uaLiToECvYBpNCCbozjaT+XCmnTFp+Ti3FIcmAzN+6UTF2/Y v3hbCpp74kuQyaGwdEt45ASk2U90oK64+pNVRRvn2UzVMHy55W3GRnt/O3PU3uuq4Ixr IPpLoAw0j4gSEm0k69X6UCvj9bSKwPal9e/OGXyKXHyBtEuFnOBn8qt+6ivzyy5OZxVM ZAdg/WumpkxqibrQCDskYLSk2LSuKnUd07ix/1dZlxWJGAUCqPnYVEUCpJ6wfIee/blg dNuA== X-Gm-Message-State: AOJu0YyWsZ7Nt/DXDySgdK/FjDgoyhn56V4Zdwn1v6DFMWrwzSoPxr5H 3/zi6YjkomXONwGUG+S4gHK1hg== X-Received: by 2002:a19:5e1d:0:b0:50b:f03c:1eb2 with SMTP id s29-20020a195e1d000000b0050bf03c1eb2mr3934707lfb.20.1702484944075; Wed, 13 Dec 2023 08:29:04 -0800 (PST) Received: from krzk-bin.. ([178.197.218.27]) by smtp.gmail.com with ESMTPSA id br7-20020a056512400700b0050bfe37d28asm1641026lfb.34.2023.12.13.08.29.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 08:29:03 -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 v2 1/4] arm64: dts: qcom: sm8450: move Soundwire pinctrl to its nodes Date: Wed, 13 Dec 2023 17:28:53 +0100 Message-Id: <20231213162856.188566-2-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231213162856.188566-1-krzysztof.kozlowski@linaro.org> References: <20231213162856.188566-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_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 13 Dec 2023 08:29:11 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785184861384117848 X-GMAIL-MSGID: 1785184861384117848 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 Reviewed-by: Neil Armstrong --- Not tested on HW. --- arch/arm64/boot/dts/qcom/sm8450.dtsi | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm8450.dtsi b/arch/arm64/boot/dts/qcom/sm8450.dtsi index 12e55a0c7417..3b6ea9653d2a 100644 --- a/arch/arm64/boot/dts/qcom/sm8450.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8450.dtsi @@ -2160,8 +2160,6 @@ wsa2macro: codec@31e0000 { #clock-cells = <0>; clock-output-names = "wsa2-mclk"; - pinctrl-names = "default"; - pinctrl-0 = <&wsa2_swr_active>; #sound-dai-cells = <1>; }; @@ -2173,6 +2171,9 @@ swr4: soundwire-controller@31f0000 { clock-names = "iface"; label = "WSA2"; + pinctrl-0 = <&wsa2_swr_active>; + pinctrl-names = "default"; + qcom,din-ports = <2>; qcom,dout-ports = <6>; @@ -2208,8 +2209,6 @@ rxmacro: codec@3200000 { #clock-cells = <0>; clock-output-names = "mclk"; - pinctrl-names = "default"; - pinctrl-0 = <&rx_swr_active>; #sound-dai-cells = <1>; }; @@ -2223,6 +2222,9 @@ swr1: soundwire-controller@3210000 { qcom,din-ports = <0>; qcom,dout-ports = <5>; + pinctrl-0 = <&rx_swr_active>; + pinctrl-names = "default"; + qcom,ports-sinterval-low = /bits/ 8 <0x03 0x1f 0x1f 0x07 0x00>; qcom,ports-offset1 = /bits/ 8 <0x00 0x00 0x0b 0x01 0x00>; qcom,ports-offset2 = /bits/ 8 <0x00 0x00 0x0b 0x00 0x00>; @@ -2254,8 +2256,6 @@ txmacro: codec@3220000 { #clock-cells = <0>; clock-output-names = "mclk"; - pinctrl-names = "default"; - pinctrl-0 = <&tx_swr_active>; #sound-dai-cells = <1>; }; @@ -2275,8 +2275,6 @@ wsamacro: codec@3240000 { #clock-cells = <0>; clock-output-names = "mclk"; - pinctrl-names = "default"; - pinctrl-0 = <&wsa_swr_active>; #sound-dai-cells = <1>; }; @@ -2288,6 +2286,9 @@ swr0: soundwire-controller@3250000 { clock-names = "iface"; label = "WSA"; + pinctrl-0 = <&wsa_swr_active>; + pinctrl-names = "default"; + qcom,din-ports = <2>; qcom,dout-ports = <6>; @@ -2318,6 +2319,9 @@ swr2: soundwire-controller@33b0000 { 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>;