From nobody Sun Dec 28 00:52:28 2025 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 259B1C4332F for ; Wed, 13 Dec 2023 16:29:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235115AbjLMQ3C (ORCPT ); Wed, 13 Dec 2023 11:29:02 -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-Google-Smtp-Source: AGHT+IHtY5gkQmmJhndNfLTuymBN96U+PgF076ivxPPJWBCxoTTijgt9TkViwC9hvJ0o+aI9ZxUjpA== 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 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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/qco= m/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 { =20 #clock-cells =3D <0>; clock-output-names =3D "wsa2-mclk"; - pinctrl-names =3D "default"; - pinctrl-0 =3D <&wsa2_swr_active>; #sound-dai-cells =3D <1>; }; =20 @@ -2173,6 +2171,9 @@ swr4: soundwire-controller@31f0000 { clock-names =3D "iface"; label =3D "WSA2"; =20 + pinctrl-0 =3D <&wsa2_swr_active>; + pinctrl-names =3D "default"; + qcom,din-ports =3D <2>; qcom,dout-ports =3D <6>; =20 @@ -2208,8 +2209,6 @@ rxmacro: codec@3200000 { =20 #clock-cells =3D <0>; clock-output-names =3D "mclk"; - pinctrl-names =3D "default"; - pinctrl-0 =3D <&rx_swr_active>; #sound-dai-cells =3D <1>; }; =20 @@ -2223,6 +2222,9 @@ swr1: soundwire-controller@3210000 { qcom,din-ports =3D <0>; qcom,dout-ports =3D <5>; =20 + pinctrl-0 =3D <&rx_swr_active>; + pinctrl-names =3D "default"; + qcom,ports-sinterval-low =3D /bits/ 8 <0x03 0x1f 0x1f 0x07 0x00>; qcom,ports-offset1 =3D /bits/ 8 <0x00 0x00 0x0b 0x01 0x00>; qcom,ports-offset2 =3D /bits/ 8 <0x00 0x00 0x0b 0x00 0x00>; @@ -2254,8 +2256,6 @@ txmacro: codec@3220000 { =20 #clock-cells =3D <0>; clock-output-names =3D "mclk"; - pinctrl-names =3D "default"; - pinctrl-0 =3D <&tx_swr_active>; #sound-dai-cells =3D <1>; }; =20 @@ -2275,8 +2275,6 @@ wsamacro: codec@3240000 { =20 #clock-cells =3D <0>; clock-output-names =3D "mclk"; - pinctrl-names =3D "default"; - pinctrl-0 =3D <&wsa_swr_active>; #sound-dai-cells =3D <1>; }; =20 @@ -2288,6 +2286,9 @@ swr0: soundwire-controller@3250000 { clock-names =3D "iface"; label =3D "WSA"; =20 + pinctrl-0 =3D <&wsa_swr_active>; + pinctrl-names =3D "default"; + qcom,din-ports =3D <2>; qcom,dout-ports =3D <6>; =20 @@ -2318,6 +2319,9 @@ swr2: soundwire-controller@33b0000 { clock-names =3D "iface"; label =3D "TX"; =20 + pinctrl-0 =3D <&tx_swr_active>; + pinctrl-names =3D "default"; + qcom,din-ports =3D <4>; qcom,dout-ports =3D <0>; qcom,ports-sinterval-low =3D /bits/ 8 <0x01 0x01 0x03 0x03>; --=20 2.34.1 From nobody Sun Dec 28 00:52:28 2025 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 938C2C4332F for ; Wed, 13 Dec 2023 16:29:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1379102AbjLMQ3H (ORCPT ); Wed, 13 Dec 2023 11:29:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45942 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378857AbjLMQ3C (ORCPT ); Wed, 13 Dec 2023 11:29:02 -0500 Received: from mail-lf1-x136.google.com (mail-lf1-x136.google.com [IPv6:2a00:1450:4864:20::136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 012C0B9 for ; Wed, 13 Dec 2023 08:29:07 -0800 (PST) Received: by mail-lf1-x136.google.com with SMTP id 2adb3069b0e04-50e04354de0so3404353e87.1 for ; Wed, 13 Dec 2023 08:29:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1702484946; x=1703089746; 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=cKxXRg/SZys6FO13tqlijkOM+4H33mlk0pHh32bAe4Y=; b=M/r+E3uaLpSzra0frRwZgjZLEkBYnAR6YSyfRJLFi6kRf2e5uMP5nRw2j0dkoC+JSs AVTFLk/OZdXiU1DkLSzD4rZueMdtcvKza+AbGP4I3fRfNNL7yYOHuFauhaL2PxI0wwri 8qSIJbfjALsqd9rbuwebjA8IDrmvhnl5vEgFwVor/xmOaJbncNyPLuXuLN6G69M3A23T hHPJmQyEMHhvmAGVg5WGhCyFF6bOM1LYfGd6HkGOQSwZS8Zv0SMHxM1IidipZpUxOLLo Rl94fNs2A7Ea9raUwNZBlt3COD/c5SgLD82/WY5ITQMISW5exWTjkJ29k2K9Rnho4YuL AXYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702484946; x=1703089746; 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=cKxXRg/SZys6FO13tqlijkOM+4H33mlk0pHh32bAe4Y=; b=crLujgnRDW+TCZWy90nGsXzYF09rFTZyHKmh0E61lR8cKBmZXhjWBwfX8h2gkFF8fp N9JGGN7Li0ZGWFmdnNu5pEkxAo6QziDLhUDso1zv3MPNkXI11QWPLzILiwSpB2SKkGgY +tD2IYoHbNIrux5PolLlmCQ5uaY+dJVxiGCMGX+i682IwFEMBxKC4wKq1CpELAvO+llA Mh1xNJlA0Y2IH8de1Gd3HAUBGpAhG0R61dOAEwXeQcyWiT4d8Jj/bqFzAElum246q3+D nSL8qV6Y41fJeZX2/mNgfrTAdJUBlcJR2E+nt0bV1wOV9PXqPQXu6K5SNfozAxLah273 iPvw== X-Gm-Message-State: AOJu0YydaOop6DHVdnaeo0k2fTpq3YXHtMLynDt/ZESIXGA2he+u0QrF BQs6O1md5yW7vPOKkjRhQJlEmg== X-Google-Smtp-Source: AGHT+IHf9IiHPvJCEC3DQSxTE1TxDgrJqImgSFv7iR/nFFuTnyuB123rIDC3/MCbkrTfPq6s7c9fFg== X-Received: by 2002:a05:6512:3b0a:b0:50b:e056:277e with SMTP id f10-20020a0565123b0a00b0050be056277emr5280385lfv.52.1702484946231; Wed, 13 Dec 2023 08:29:06 -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.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 08:29:05 -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 2/4] arm64: dts: qcom: sm8450: drop unneeded assigned-clocks from codec macros Date: Wed, 13 Dec 2023 17:28:54 +0100 Message-Id: <20231213162856.188566-3-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 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The MCLK clocks of codec macros have fixed 19.2 MHz frequency and assigning clock rates is redundant. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Neil Armstrong --- Not tested on HW. --- arch/arm64/boot/dts/qcom/sm8450.dtsi | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm8450.dtsi b/arch/arm64/boot/dts/qco= m/sm8450.dtsi index 3b6ea9653d2a..52390220d909 100644 --- a/arch/arm64/boot/dts/qcom/sm8450.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8450.dtsi @@ -2154,9 +2154,6 @@ wsa2macro: codec@31e0000 { <&q6prmcc LPASS_HW_DCODEC_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>, <&vamacro>; clock-names =3D "mclk", "npl", "macro", "dcodec", "fsgen"; - assigned-clocks =3D <&q6prmcc LPASS_CLK_ID_WSA2_CORE_TX_MCLK LPASS_CLK_= ATTRIBUTE_COUPLE_NO>, - <&q6prmcc LPASS_CLK_ID_WSA2_CORE_TX_2X_MCLK LPASS_CLK_ATTRIBUTE_COU= PLE_NO>; - assigned-clock-rates =3D <19200000>, <19200000>; =20 #clock-cells =3D <0>; clock-output-names =3D "wsa2-mclk"; @@ -2203,10 +2200,6 @@ rxmacro: codec@3200000 { <&vamacro>; clock-names =3D "mclk", "npl", "macro", "dcodec", "fsgen"; =20 - assigned-clocks =3D <&q6prmcc LPASS_CLK_ID_RX_CORE_TX_MCLK LPASS_CLK_AT= TRIBUTE_COUPLE_NO>, - <&q6prmcc LPASS_CLK_ID_RX_CORE_MCLK2_2X_MCLK LPASS_CLK_ATTRIBUTE_CO= UPLE_NO>; - assigned-clock-rates =3D <19200000>, <19200000>; - #clock-cells =3D <0>; clock-output-names =3D "mclk"; #sound-dai-cells =3D <1>; @@ -2250,9 +2243,6 @@ txmacro: codec@3220000 { <&q6prmcc LPASS_HW_DCODEC_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>, <&vamacro>; clock-names =3D "mclk", "npl", "macro", "dcodec", "fsgen"; - assigned-clocks =3D <&q6prmcc LPASS_CLK_ID_RX_CORE_TX_MCLK LPASS_CLK_AT= TRIBUTE_COUPLE_NO>, - <&q6prmcc LPASS_CLK_ID_RX_CORE_MCLK2_2X_MCLK LPASS_CLK_ATTRIBUTE_CO= UPLE_NO>; - assigned-clock-rates =3D <19200000>, <19200000>; =20 #clock-cells =3D <0>; clock-output-names =3D "mclk"; @@ -2269,10 +2259,6 @@ wsamacro: codec@3240000 { <&vamacro>; clock-names =3D "mclk", "npl", "macro", "dcodec", "fsgen"; =20 - assigned-clocks =3D <&q6prmcc LPASS_CLK_ID_WSA_CORE_TX_MCLK LPASS_CLK_A= TTRIBUTE_COUPLE_NO>, - <&q6prmcc LPASS_CLK_ID_WSA_CORE_TX_2X_MCLK LPASS_CLK_ATTRIBUTE_COUP= LE_NO>; - assigned-clock-rates =3D <19200000>, <19200000>; - #clock-cells =3D <0>; clock-output-names =3D "mclk"; #sound-dai-cells =3D <1>; @@ -2348,8 +2334,6 @@ vamacro: codec@33f0000 { <&q6prmcc LPASS_HW_DCODEC_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>, <&q6prmcc LPASS_CLK_ID_RX_CORE_MCLK2_2X_MCLK LPASS_CLK_ATTRIBUTE_COUP= LE_NO>; clock-names =3D "mclk", "macro", "dcodec", "npl"; - assigned-clocks =3D <&q6prmcc LPASS_CLK_ID_TX_CORE_MCLK LPASS_CLK_ATTRI= BUTE_COUPLE_NO>; - assigned-clock-rates =3D <19200000>; =20 #clock-cells =3D <0>; clock-output-names =3D "fsgen"; --=20 2.34.1 From nobody Sun Dec 28 00:52:28 2025 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 CB180C4167B for ; Wed, 13 Dec 2023 16:29:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377345AbjLMQ3K (ORCPT ); Wed, 13 Dec 2023 11:29:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46002 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233578AbjLMQ3E (ORCPT ); Wed, 13 Dec 2023 11:29:04 -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 01D02F3 for ; Wed, 13 Dec 2023 08:29:09 -0800 (PST) Received: by mail-lf1-x134.google.com with SMTP id 2adb3069b0e04-50bf32c0140so8110449e87.1 for ; Wed, 13 Dec 2023 08:29:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1702484948; x=1703089748; 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=dYnjOtpmKjg4GHWhqzNDp6EKEDaiJS8Nx+2o8mHB8bhiqjDodq7dChEPR6L+dSTC1X DqI1HnyTr9MZP1mTRLaAQrb3GtFS/RvifnO61mkRcOApX/y4EZkKBO+4UexRQ5quGShJ 8TLZ13SUnU6tqagVqOWaQjaDNxkj87usGsxKTZ/ayWO7UF1eq6TIC40mfoBCLFD/XSyL jHf+1etIble+SvvrZ+2vGh+c+pH77c4cIXRPhjRgDqqQy4IYwvzJ4FQD0EHL5CpyjFP0 XU97jFXo1sVtfWg2IERRN8YXr/dZ7xL9l3OST+JrtDSCUDGm2ZN9YhiDdlPrn8zRQv8U kZ9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702484948; x=1703089748; 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=jEJ2KGL67z4FlK4anX7dbQmQ2RLxW79L68u+nw13mnHx1fnd858R67pnocMw2VnrYY oK7Se9eoGGzldGK0oxHaBOrouWwEpuOs4Ch0L14YbzvY3D56R1+ufZoRXUEJmBOWCDRI QcNblcggv056UKFiIAyi6idr9RC5cY5a1hXCoTZ0LbR6+AS1JBA/oSVtXMGixtXY7jlR EkMZbBwsdp1X5o6clKNLfU8niwMvO9oF3CPm4BS2vcEjjKmR2NhsMY/fOHP3/TnBzi7+ ny9DsjO8srwFSWzVqB2QOl+6RjWC9BrlUStaxVZXZUAsPND3DWDo9+OHAtC6Vei25GAt hdtg== X-Gm-Message-State: AOJu0YwBJVDh+2LVQWDuA/nvxcoyIubJ/wb1c96HD2EcXdUMMsj+DuOR vIRkZcH+nhhVQ9jMsDZCTtyMXw== X-Google-Smtp-Source: AGHT+IF3V4GjzyZmMwHdlCvCM9mUMLaBxXfJBCvlAZ8+rLP7Wm0ND/VzVwR6nDgB+2BRfaOBZJH5tQ== X-Received: by 2002:a19:2d5e:0:b0:50b:e6ff:e53e with SMTP id t30-20020a192d5e000000b0050be6ffe53emr3148181lft.9.1702484948105; Wed, 13 Dec 2023 08:29:08 -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.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 08:29:07 -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 3/4] arm64: dts: qcom: sm8550: move Soundwire pinctrl to its nodes Date: Wed, 13 Dec 2023 17:28:55 +0100 Message-Id: <20231213162856.188566-4-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 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 --- 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/qco= m/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 { =20 #clock-cells =3D <0>; clock-output-names =3D "wsa2-mclk"; - pinctrl-names =3D "default"; - pinctrl-0 =3D <&wsa2_swr_active>; #sound-dai-cells =3D <1>; }; =20 @@ -2063,6 +2061,9 @@ swr3: soundwire-controller@6ab0000 { clock-names =3D "iface"; label =3D "WSA2"; =20 + pinctrl-0 =3D <&wsa2_swr_active>; + pinctrl-names =3D "default"; + qcom,din-ports =3D <4>; qcom,dout-ports =3D <9>; =20 @@ -2096,8 +2097,6 @@ lpass_rxmacro: codec@6ac0000 { =20 #clock-cells =3D <0>; clock-output-names =3D "mclk"; - pinctrl-names =3D "default"; - pinctrl-0 =3D <&rx_swr_active>; #sound-dai-cells =3D <1>; }; =20 @@ -2109,6 +2108,9 @@ swr1: soundwire-controller@6ad0000 { clock-names =3D "iface"; label =3D "RX"; =20 + pinctrl-0 =3D <&rx_swr_active>; + pinctrl-names =3D "default"; + qcom,din-ports =3D <1>; qcom,dout-ports =3D <11>; =20 @@ -2142,8 +2144,6 @@ lpass_txmacro: codec@6ae0000 { =20 #clock-cells =3D <0>; clock-output-names =3D "mclk"; - pinctrl-names =3D "default"; - pinctrl-0 =3D <&tx_swr_active>; #sound-dai-cells =3D <1>; }; =20 @@ -2161,8 +2161,6 @@ lpass_wsamacro: codec@6b00000 { =20 #clock-cells =3D <0>; clock-output-names =3D "mclk"; - pinctrl-names =3D "default"; - pinctrl-0 =3D <&wsa_swr_active>; #sound-dai-cells =3D <1>; }; =20 @@ -2174,6 +2172,9 @@ swr0: soundwire-controller@6b10000 { clock-names =3D "iface"; label =3D "WSA"; =20 + pinctrl-0 =3D <&wsa_swr_active>; + pinctrl-names =3D "default"; + qcom,din-ports =3D <4>; qcom,dout-ports =3D <9>; =20 @@ -2203,6 +2204,9 @@ swr2: soundwire-controller@6d30000 { clock-names =3D "iface"; label =3D "TX"; =20 + pinctrl-0 =3D <&tx_swr_active>; + pinctrl-names =3D "default"; + qcom,din-ports =3D <4>; qcom,dout-ports =3D <0>; qcom,ports-sinterval-low =3D /bits/ 8 <0x01 0x01 0x03 0x03>; --=20 2.34.1 From nobody Sun Dec 28 00:52:28 2025 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 0D370C4167D for ; Wed, 13 Dec 2023 16:29:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235529AbjLMQ3T (ORCPT ); Wed, 13 Dec 2023 11:29:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46166 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235459AbjLMQ3H (ORCPT ); Wed, 13 Dec 2023 11:29:07 -0500 Received: from mail-lf1-x12d.google.com (mail-lf1-x12d.google.com [IPv6:2a00:1450:4864:20::12d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0EAB7110 for ; Wed, 13 Dec 2023 08:29:12 -0800 (PST) Received: by mail-lf1-x12d.google.com with SMTP id 2adb3069b0e04-50c0f13ea11so8248064e87.3 for ; Wed, 13 Dec 2023 08:29:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1702484950; x=1703089750; 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=HKKYqdbc3N4hC1UQxae75xN4voBqyRjMYCSX3oX7340=; b=JUZy9Kz6HdBfUuhevjMlVkUcD+81IIaH2omoXkJCS1JsxcMzC6q9zmNwONYQ51QFNz eaLAiYwH8LH9902JI+F4O6Rh91x9BqkBY/+gIi1uDtwF2RHp0Wfthy3f4PAJOh3ZJCdi P7eQD31WO7V3wySlzVr1ktB4WnhbldY/E1rD3Gb+XcgtoZ7fLUUbmksG0jkm/aGB0Eng t2sc9gd0JsWnHMPEBr36ut8vuX6Hx8+jcdtFH2xKsiX9YD3VPzmv9p6dyQb2hr/1jXCS zgGip/uUbqqHLwZeR7vUtd9EsBU6Bbs2/GLeCyfTHjmPXztAeILAvPAPq7lhcUyHacUV Mwmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702484950; x=1703089750; 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=HKKYqdbc3N4hC1UQxae75xN4voBqyRjMYCSX3oX7340=; b=RA8Y4b4VfWdFZB+niF+KaxSBmKFOohpB4dhDNPRAkFVgbj9aN2ooeyCNqfUCQY97lV W1dIfrGvDGOIn4KYhUPB+nFYEHwNXp4qND/SY/2VOkrc4KEcArI1dAaFnuRC7j6t38Uk R+xtuZNqwp1dm4i1iAblkgjlx6Ctv8FIr7QaAEdcdF7Xl8vmwuUFfSlrCZAOopRzMbEX Ag3OMNDkLMnlvgxLt63rZIC9yTCBTTM87FLz6iLdfQtWo+v2NfPRAq2aVw1OBFLDljbJ s9CqIeUw37VkXRS9d0tWN3D6yk8bznxaqPgK1pdoUefVVLWjo4XqkxkkPLqDzt6HTv5q f+5Q== X-Gm-Message-State: AOJu0YxsXhYth0W+Zp7ySrMqHjF5PHHn83i+JBs3pxiqBhTDgoWvWBjF wz2dRG4gpG7PjTH49kzNBBRsbQ== X-Google-Smtp-Source: AGHT+IFhiIHvz0lgDTjS66FZRNJnwWFEoOQlmEuaGIwBD+A+MfQB0UBwiU1ZeyyiB/CaBHRAQcATAg== X-Received: by 2002:a05:6512:2211:b0:50c:a89:a70e with SMTP id h17-20020a056512221100b0050c0a89a70emr5033349lfu.94.1702484950440; Wed, 13 Dec 2023 08:29:10 -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.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 08:29:10 -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 4/4] arm64: dts: qcom: sm8550: drop unneeded assigned-clocks from codec macros Date: Wed, 13 Dec 2023 17:28:56 +0100 Message-Id: <20231213162856.188566-5-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 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The MCLK clocks of codec macros have fixed 19.2 MHz frequency and assigning clock rates is redundant. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Neil Armstrong --- arch/arm64/boot/dts/qcom/sm8550.dtsi | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm8550.dtsi b/arch/arm64/boot/dts/qco= m/sm8550.dtsi index d8f79b5895f5..68b05ab5f65f 100644 --- a/arch/arm64/boot/dts/qcom/sm8550.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8550.dtsi @@ -2045,8 +2045,6 @@ lpass_wsa2macro: codec@6aa0000 { <&q6prmcc LPASS_HW_DCODEC_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>, <&lpass_vamacro>; clock-names =3D "mclk", "macro", "dcodec", "fsgen"; - assigned-clocks =3D <&q6prmcc LPASS_CLK_ID_WSA2_CORE_TX_MCLK LPASS_CLK_= ATTRIBUTE_COUPLE_NO>; - assigned-clock-rates =3D <19200000>; =20 #clock-cells =3D <0>; clock-output-names =3D "wsa2-mclk"; @@ -2092,9 +2090,6 @@ lpass_rxmacro: codec@6ac0000 { <&lpass_vamacro>; clock-names =3D "mclk", "macro", "dcodec", "fsgen"; =20 - assigned-clocks =3D <&q6prmcc LPASS_CLK_ID_RX_CORE_TX_MCLK LPASS_CLK_AT= TRIBUTE_COUPLE_NO>; - assigned-clock-rates =3D <19200000>; - #clock-cells =3D <0>; clock-output-names =3D "mclk"; #sound-dai-cells =3D <1>; @@ -2138,9 +2133,6 @@ lpass_txmacro: codec@6ae0000 { <&q6prmcc LPASS_HW_DCODEC_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>, <&lpass_vamacro>; clock-names =3D "mclk", "macro", "dcodec", "fsgen"; - assigned-clocks =3D <&q6prmcc LPASS_CLK_ID_TX_CORE_MCLK LPASS_CLK_ATTRI= BUTE_COUPLE_NO>; - - assigned-clock-rates =3D <19200000>; =20 #clock-cells =3D <0>; clock-output-names =3D "mclk"; @@ -2156,9 +2148,6 @@ lpass_wsamacro: codec@6b00000 { <&lpass_vamacro>; clock-names =3D "mclk", "macro", "dcodec", "fsgen"; =20 - assigned-clocks =3D <&q6prmcc LPASS_CLK_ID_WSA_CORE_TX_MCLK LPASS_CLK_A= TTRIBUTE_COUPLE_NO>; - assigned-clock-rates =3D <19200000>; - #clock-cells =3D <0>; clock-output-names =3D "mclk"; #sound-dai-cells =3D <1>; @@ -2233,9 +2222,6 @@ lpass_vamacro: codec@6d44000 { <&q6prmcc LPASS_HW_DCODEC_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>; clock-names =3D "mclk", "macro", "dcodec"; =20 - assigned-clocks =3D <&q6prmcc LPASS_CLK_ID_TX_CORE_MCLK LPASS_CLK_ATTRI= BUTE_COUPLE_NO>; - assigned-clock-rates =3D <19200000>; - #clock-cells =3D <0>; clock-output-names =3D "fsgen"; #sound-dai-cells =3D <1>; --=20 2.34.1