From patchwork Wed Dec 13 16:25:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 754007 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="bwDCU34T" 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 7B11DB9 for ; Wed, 13 Dec 2023 08:25:41 -0800 (PST) Received: by mail-lf1-x12d.google.com with SMTP id 2adb3069b0e04-50be9e6427dso7585919e87.1 for ; Wed, 13 Dec 2023 08:25:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1702484739; x=1703089539; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=NEzLaoNa4BA2w8OvaI5sizwaYC3nqK5NDpqXu6xPo90=; b=bwDCU34TKOnn+rqduMXMYWzpqQM5AzEVU6bc5VmcCt0BSjXQyWIh1SuUPpoammUKh4 wUgWCytNMULSJZmgDwWstN/JWh86Ll9VA6tXLfDHLC78tY07rpS8focHK1HPMvldES3g E60GLPnWZVEWAU+ziYQ4qrqDKOM1OSWhN4r4kapHVW2dGRGAVknLQ6qA5VUGmcvb6smC 5v59m2nhyScF4oq3ic+G76k9p724JEFisBcbgqmjE69zUiUrzW9YT61V+5ULRCVMEC7z M8SDj9Pp9UuID+zyC1ynobqBZjuLYmGKpSHHfn5Tg8LEvH4seFz81/VjmK8YzyRon41+ gtXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702484739; x=1703089539; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=NEzLaoNa4BA2w8OvaI5sizwaYC3nqK5NDpqXu6xPo90=; b=l+yJzhxoeSMzqUEGI/MZx0fRkFNgHxga6dRITAzaN6cG3kk2wUWBHcZhLqNPO9Bsqu iisTueuT8JakFrcKtjQYtDrco0PIxrZvTmDlwi0MI9SIdU+5/kfB5UjXH4QpQswbMrSP IKbGKXZ+p0+Y/ZET5yLgsMZhM66ms55vGG4QH9r4JPaRo0ugC8KE0+IdWNMoWbttgs31 FCFHulJv9gWkVasppK1mx6mowSS69JrYJM+FZdVSNANwUuVuRfU46Nv+sBH65cc1590n n4KVFixuukNoSWWdjAaF6NYWl5NR86kNAYcBRH9jhxqdMmhqXRSCxDQv1ewtLD9NyHKX NF3Q== X-Gm-Message-State: AOJu0Ywk55vOXKhyq9Iyc8+P+aYeUkW1rjVhWbQk5WKhdc73YXevy6HJ zKuaxRHUByE0oWer66OryXmatg== X-Google-Smtp-Source: AGHT+IG5E98UlR0GcrnhVIDtGNzI9Lp1cS9Z1Gd+hPYxMOSd7wpz4W9RmVacJEy0D/WAkK4N263y/Q== X-Received: by 2002:a05:6512:110d:b0:50b:f858:f138 with SMTP id l13-20020a056512110d00b0050bf858f138mr4628794lfg.89.1702484739673; Wed, 13 Dec 2023 08:25:39 -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.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 08:25:39 -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 1/4] arm64: dts: qcom: sm8450: move Soundwire pinctrl to its nodes Date: Wed, 13 Dec 2023 17:25:32 +0100 Message-Id: <20231213162536.171475-1-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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 --- 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>; From patchwork Wed Dec 13 16:25:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 753599 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="Lu+na4VV" Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7E97983 for ; Wed, 13 Dec 2023 08:25:42 -0800 (PST) Received: by mail-ed1-x52f.google.com with SMTP id 4fb4d7f45d1cf-54c9116d05fso9506927a12.3 for ; Wed, 13 Dec 2023 08:25:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1702484741; x=1703089541; 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=Lu+na4VVfszJlk5xn0E0Bxp56SFHLEoYRPFODY968yxiNRPAy3ECzUKbCahZH7kwOz xVArhZF+wgkPJnx7DnkIjZ6p0UDKwakNx5iD2RcdKbemdfn3u6FV/IeBdv7WzhuzCUVa AY55c/JI43PIQnMeEKdt25WsoYm7erimrlYL7BS8d13zjYdCdOqRQD6xFdNe+dYbrB2K BeUbNc829/dHFpRHci4l65IvzQI3trFmvuMOzs583WLta2cdX1nin3o09q7BCJRo1TVm BL77qjnrHIh133QijNoGhhUYbIl/1YnQtRvbr5FxZ2bjd//zHEWiTVX1UIsl5L12Y26f Grww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702484741; x=1703089541; 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=GjiSZk313yDI4VLZrmvbDDX1YY26OAjGBNBkN1HAXGq+vYBApiRwfl1I67mvKJjy3p y8bZm+jtZHZwT20t5kM003Ooou9HNXy8OU7pcC4Twfumym0mCGtnYoJ1shTekQikIfxN rsTmnfcbfBB+q8w9G9rl5B2H9ggkJmQamgIoYWw3fW2Q0cfa2eJXbFikh8P/RvNKqtHP JQICzC/IjO90LwJvaX3RpdgyO6VCtXls799X+nxZQYCOvRFAIMQuAh6BnNxxWQkEUNR/ ptpWsY1ofF40holAU8/DJHCpswA8uG7GzB+auxxQbePgjmCLA9yRrX3ls/YQtJk3Egmy IPQQ== X-Gm-Message-State: AOJu0YxOEJ0A6qKZRd6CNTEI2WSKir9VHoYgUR4hrmsjdW2fuL//QSna XMoklk16CH0+Jgkgy+4gG6RVrg== X-Google-Smtp-Source: AGHT+IFv5LFyq6GSFNmr0clEapUNiqem0EWn7blPPyL1WqT+BoCaSNH81eJ/OylrsOyXgKxtMg++kw== X-Received: by 2002:a17:907:766f:b0:a19:d40a:d1ff with SMTP id kk15-20020a170907766f00b00a19d40ad1ffmr2128393ejc.203.1702484741003; Wed, 13 Dec 2023 08:25:41 -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.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 08:25:40 -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/4] arm64: dts: qcom: sm8450: drop unneeded assigned-clocks from codec macros Date: Wed, 13 Dec 2023 17:25:33 +0100 Message-Id: <20231213162536.171475-2-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> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The MCLK clocks of codec macros have fixed 19.2 MHz frequency and assigning clock rates is redundant. Signed-off-by: Krzysztof Kozlowski --- 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/qcom/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 = "mclk", "npl", "macro", "dcodec", "fsgen"; - assigned-clocks = <&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_COUPLE_NO>; - assigned-clock-rates = <19200000>, <19200000>; #clock-cells = <0>; clock-output-names = "wsa2-mclk"; @@ -2203,10 +2200,6 @@ rxmacro: codec@3200000 { <&vamacro>; clock-names = "mclk", "npl", "macro", "dcodec", "fsgen"; - assigned-clocks = <&q6prmcc LPASS_CLK_ID_RX_CORE_TX_MCLK LPASS_CLK_ATTRIBUTE_COUPLE_NO>, - <&q6prmcc LPASS_CLK_ID_RX_CORE_MCLK2_2X_MCLK LPASS_CLK_ATTRIBUTE_COUPLE_NO>; - assigned-clock-rates = <19200000>, <19200000>; - #clock-cells = <0>; clock-output-names = "mclk"; #sound-dai-cells = <1>; @@ -2250,9 +2243,6 @@ txmacro: codec@3220000 { <&q6prmcc LPASS_HW_DCODEC_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>, <&vamacro>; clock-names = "mclk", "npl", "macro", "dcodec", "fsgen"; - assigned-clocks = <&q6prmcc LPASS_CLK_ID_RX_CORE_TX_MCLK LPASS_CLK_ATTRIBUTE_COUPLE_NO>, - <&q6prmcc LPASS_CLK_ID_RX_CORE_MCLK2_2X_MCLK LPASS_CLK_ATTRIBUTE_COUPLE_NO>; - assigned-clock-rates = <19200000>, <19200000>; #clock-cells = <0>; clock-output-names = "mclk"; @@ -2269,10 +2259,6 @@ wsamacro: codec@3240000 { <&vamacro>; clock-names = "mclk", "npl", "macro", "dcodec", "fsgen"; - assigned-clocks = <&q6prmcc LPASS_CLK_ID_WSA_CORE_TX_MCLK LPASS_CLK_ATTRIBUTE_COUPLE_NO>, - <&q6prmcc LPASS_CLK_ID_WSA_CORE_TX_2X_MCLK LPASS_CLK_ATTRIBUTE_COUPLE_NO>; - assigned-clock-rates = <19200000>, <19200000>; - #clock-cells = <0>; clock-output-names = "mclk"; #sound-dai-cells = <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_COUPLE_NO>; clock-names = "mclk", "macro", "dcodec", "npl"; - assigned-clocks = <&q6prmcc LPASS_CLK_ID_TX_CORE_MCLK LPASS_CLK_ATTRIBUTE_COUPLE_NO>; - assigned-clock-rates = <19200000>; #clock-cells = <0>; clock-output-names = "fsgen"; From patchwork Wed Dec 13 16:25:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 753598 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="pzuNlUOh" Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E3256EA for ; Wed, 13 Dec 2023 08:25:44 -0800 (PST) Received: by mail-ed1-x534.google.com with SMTP id 4fb4d7f45d1cf-54cd2281ccbso9304043a12.2 for ; Wed, 13 Dec 2023 08:25:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1702484743; x=1703089543; 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=pzuNlUOhIoTE4WWFVONCAdtW6UTIvY2igyhxfa08zkdkKM+BAjSBHODmWqaIU+iXcb 6BnHlv64y7fq50Wn286F5ME9RGmDLbLojh4we1hF2gB+zd0lij1dSWRwZpnq7Wb3DNyX NF3nyrE+OH7VljP4LBlyg6Y24cL6QcpCEntCIFCMqnb3rzzd+8S6xKDRPUDRrvf8fofQ wWDg+H4ZNGW40RIhmhaCHafBwmmt82LuW2Fjb7o0kLlzSeAhB17gNYJiiSe4fs8eZg7B RGA+55w2qEJw1jvjqybp32MLflhvQIDkCmDQ+tMEQj02vzFsOTyayAMGr8uwQQNPyW6A 0HFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702484743; x=1703089543; 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=LI2iZtrA1Yb6VlDq4JQ9hNKs0+GAOy54j5pStfpxpYfpbD8GNUTtZ4qlesl60zNZz7 auDKuWBwLrUaopI/Y5uau5zWV/t/6iEB3DxjFYZC3ev1khs9Cjp7wSdDr51rL9FeQNHh 3C/qeeS0ZE/Wfsbl9ikWkedNULEk/XKaLa6aUV1/VLUDWBc9dMNJrYeK0UhBmCkoLxGP MFPSZeS3TvTxuoEWhfGSgAHElcv/EfBHOokHKunOq4L8ZM+mIMUNZzqiMKzikuqNyfvG WFVDGmyW2YrXVX9rcNVYcjvVEjYc8pqq6obdCEmkSd2Zuto+66dh2MoGoB+Eg6gURlL8 b61w== X-Gm-Message-State: AOJu0YyWAFzMNAQe76j7JtHifdqtm9JyGIaMk/6VKhNyNesfEBHczFxM cTB5Em1rl+3xvC1/bm4uMd5a4w== X-Google-Smtp-Source: AGHT+IFYR8rsO1VF//8r3xp61FMiOmVTtJhWR3SeKc7XhW8dyZuYFpYd2aa1O950RUJUMP4pn9sS4A== X-Received: by 2002:a17:906:c30a:b0:a1e:26ae:3ac5 with SMTP id s10-20020a170906c30a00b00a1e26ae3ac5mr4881307ejz.39.1702484743452; Wed, 13 Dec 2023 08:25:43 -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.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 08:25:43 -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 3/4] arm64: dts: qcom: sm8550: move Soundwire pinctrl to its nodes Date: Wed, 13 Dec 2023 17:25:35 +0100 Message-Id: <20231213162536.171475-4-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> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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 --- 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>; From patchwork Wed Dec 13 16:25:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 754005 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="IRjoeVM2" 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 1809FF2 for ; Wed, 13 Dec 2023 08:25:46 -0800 (PST) Received: by mail-ej1-x631.google.com with SMTP id a640c23a62f3a-a1f8a1e9637so829272166b.1 for ; Wed, 13 Dec 2023 08:25:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1702484744; x=1703089544; 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=IRjoeVM21R50j1yLy4kKukHS9xBIp55PFTv5n2NJ5jVAs2ihEIzk2K0bsKKXU/ivOk CzLqgRosjcL1ahA0KgIt9/bE78pIdsks3PwivTIE06LDuWYhk6YM344kmHLbuXKmgsFh KEKxrHldvqMPZnBMMzAVdEE7gW6vavWPQLZWNn4GaV6hyDM2IcNUeQB0yfDixqdHn7sa FykaFqlZx1WfLsjACx2NCnFBpmtbWHlGV+nt1ndW2kAqe+JQoIY7JV9YuXkiofFzbWSk IaPDA+nMCAGqr8FxCVSkvY6BS4bcrrAUzkElRDvR5HGPb0mMSeiTDWoV2H4oMlKn+j3J rOOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702484744; x=1703089544; 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=b5VvqKJKTTEA+RkWLuur5znLQVXYspWTWCw6df9tbgw0uBoY99NKf2+mkkgT5etn/c 0K5SYlwjg1fmPi8K9/LQlYaDz18Y9yRBI5CyOX3PVH1pNa75Hon5p+054aKSlE4OS65C ohlbthxUSWdpyW/KyNS3to/2jm5G+gQTqTqSB1TH5Us4RBqdq2UJyLeQPkun3MafcL2a E5KNVnE/Bm3f/ADRi+cDhlIdxty7L2qBD2nPukKpg8iq0jH9j6AfqqvNe8qlf7Q2NChJ FRLRlGPKGzm8Lp7eRKgf7IKLjESCsa4QFTUmvyZQD3Dp3SPsQBitZAmNtBgEL1iX8nHT 7IUw== X-Gm-Message-State: AOJu0YwodNy1AXW7PyYivrDnLPASJNMkMAlngyRMq0bViiKOqSvQZNdi IT1o3Mgom4L86y3GquspDvaBzoIKY4yDgXbtBUY= X-Google-Smtp-Source: AGHT+IHFG0Jl0N1DKFBn/+nExVQ68zOY5N449WKqehTKJtP9936qUdH+d5NImFZgsBsH6Okeu2Dl4A== X-Received: by 2002:a17:907:270f:b0:a1e:a558:748c with SMTP id w15-20020a170907270f00b00a1ea558748cmr8642392ejk.18.1702484744603; Wed, 13 Dec 2023 08:25:44 -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.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 08:25:44 -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 4/4] arm64: dts: qcom: sm8550: drop unneeded assigned-clocks from codec macros Date: Wed, 13 Dec 2023 17:25:36 +0100 Message-Id: <20231213162536.171475-5-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> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The MCLK clocks of codec macros have fixed 19.2 MHz frequency and assigning clock rates is redundant. Signed-off-by: Krzysztof Kozlowski --- 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/qcom/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 = "mclk", "macro", "dcodec", "fsgen"; - assigned-clocks = <&q6prmcc LPASS_CLK_ID_WSA2_CORE_TX_MCLK LPASS_CLK_ATTRIBUTE_COUPLE_NO>; - assigned-clock-rates = <19200000>; #clock-cells = <0>; clock-output-names = "wsa2-mclk"; @@ -2092,9 +2090,6 @@ lpass_rxmacro: codec@6ac0000 { <&lpass_vamacro>; clock-names = "mclk", "macro", "dcodec", "fsgen"; - assigned-clocks = <&q6prmcc LPASS_CLK_ID_RX_CORE_TX_MCLK LPASS_CLK_ATTRIBUTE_COUPLE_NO>; - assigned-clock-rates = <19200000>; - #clock-cells = <0>; clock-output-names = "mclk"; #sound-dai-cells = <1>; @@ -2138,9 +2133,6 @@ lpass_txmacro: codec@6ae0000 { <&q6prmcc LPASS_HW_DCODEC_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>, <&lpass_vamacro>; clock-names = "mclk", "macro", "dcodec", "fsgen"; - assigned-clocks = <&q6prmcc LPASS_CLK_ID_TX_CORE_MCLK LPASS_CLK_ATTRIBUTE_COUPLE_NO>; - - assigned-clock-rates = <19200000>; #clock-cells = <0>; clock-output-names = "mclk"; @@ -2156,9 +2148,6 @@ lpass_wsamacro: codec@6b00000 { <&lpass_vamacro>; clock-names = "mclk", "macro", "dcodec", "fsgen"; - assigned-clocks = <&q6prmcc LPASS_CLK_ID_WSA_CORE_TX_MCLK LPASS_CLK_ATTRIBUTE_COUPLE_NO>; - assigned-clock-rates = <19200000>; - #clock-cells = <0>; clock-output-names = "mclk"; #sound-dai-cells = <1>; @@ -2233,9 +2222,6 @@ lpass_vamacro: codec@6d44000 { <&q6prmcc LPASS_HW_DCODEC_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>; clock-names = "mclk", "macro", "dcodec"; - assigned-clocks = <&q6prmcc LPASS_CLK_ID_TX_CORE_MCLK LPASS_CLK_ATTRIBUTE_COUPLE_NO>; - assigned-clock-rates = <19200000>; - #clock-cells = <0>; clock-output-names = "fsgen"; #sound-dai-cells = <1>;