From patchwork Wed Jan 3 20:15:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 759997 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0DF141D52A for ; Wed, 3 Jan 2024 20:15:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="dOm3VXUt" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-40d8e7a50c1so17395485e9.2 for ; Wed, 03 Jan 2024 12:15:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1704312950; x=1704917750; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=kA0goKiU/w/eOBM3jnw0mpxXWTxX87LBykvS1BaWQpQ=; b=dOm3VXUt/EeoIsMTvSAnDt/XmoLhalSCRx8G014/9eMD2CtkoIgCpNibv09ZWATFMU Vg/2jRcWgIc8+ZslYud81p0OpfjW7YA1T2dKtQPAhPgu5UtMan1ABaLRZU9q6+w3M9OU 70wyWjgOrt54Cih4a1LGIj+/7Lyvely+s+HRQpnWR31KnpypX6c8gg6qdnytLcRI4hqa 5VzAjrEyaKqsWIMJnRnUKMXUQ7A0HigCEtoGJn6yiEfcTYx7HVidtuvpkw8huyMpUKvn uxsTHyD86Fkt2Nxlw2APJy9zW+FByCYfMGWgVbzlyyTIU3DRWf62hN2Pj/4MTLUN8ex8 2pLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704312950; x=1704917750; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kA0goKiU/w/eOBM3jnw0mpxXWTxX87LBykvS1BaWQpQ=; b=qn9S9fNx02t/wBC3LUjUaJazyYGN0xrjef8hqxeAbzp22X0PnlKim1tMH1HG5L5hUG w+yVs6/FVx+F1Zbx/4497UtPPJmzm6z4e126Ut4kyPSzAV0mERw1VDSHiWBQ7RSQ7RJh 9QBbL2acunuxRajPsT4pAEhdAaGtNoIQgC6iGT9+IHrM9gh1xnCGUUIx7zyZSW4MzUfW VfaTNTFwQZSk04lN5ZJbwohD4vi7015yyG2tlKIvYt3wmatqWs8epWXrqHJJHUFzkSu/ H6ISvlW8qeYkjFj67ejIOceHeSAHj9JKutv8eaN/hgn6v7dDFSXNXYB2t/OZ0E9kdOTd G6Uw== X-Gm-Message-State: AOJu0Yy26vBd2d9QO/EDH/ZBTiZnugkz4ygAbPS0r2DNn2TUD/vJ2sm4 Hm0ZTSPv5lccaz9n6Z9FTtletg3CHDlQWA== X-Google-Smtp-Source: AGHT+IG4C77xT/Mm6jNN5jpYils2zCkudK+B5GjU9oJeIhDRBtCpW291etSan+mLgVzx4z+hpzglnQ== X-Received: by 2002:a05:600c:3d8c:b0:40d:83c4:ff34 with SMTP id bi12-20020a05600c3d8c00b0040d83c4ff34mr3624896wmb.133.1704312950359; Wed, 03 Jan 2024 12:15:50 -0800 (PST) Received: from [10.167.154.1] (178235179036.dynamic-4-waw-k-1-3-0.vectranet.pl. [178.235.179.36]) by smtp.gmail.com with ESMTPSA id fg9-20020a056402548900b00552691fc7f9sm17549670edb.66.2024.01.03.12.15.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jan 2024 12:15:50 -0800 (PST) From: Konrad Dybcio Date: Wed, 03 Jan 2024 21:15:31 +0100 Subject: [PATCH v3 1/9] dt-bindings: usb: qcom,dwc3: Fix SDM660 clock description Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20230721-topic-rpm_clk_cleanup-v3-1-a66e698932e3@linaro.org> References: <20230721-topic-rpm_clk_cleanup-v3-0-a66e698932e3@linaro.org> In-Reply-To: <20230721-topic-rpm_clk_cleanup-v3-0-a66e698932e3@linaro.org> To: Bjorn Andersson , Greg Kroah-Hartman , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Wesley Cheng Cc: Marijn Suijten , linux-arm-msm@vger.kernel.org, linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1704312946; l=1330; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=2zYtbmnPKi8lLyIi803aWMWnlOZwvsMRdhGUfkJMl0w=; b=Ouo9OU8f7I6J1dCDUCpa1GERSaWBKioAqR3dCOfE7I3avHasuEWB2EY+44edvTFHYUr61p+bf EGvqd07Mxp1DSnrryk+PoSgSVMrzaWXPbXLwU2u4YWIZciYElrAoae4 X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= SDM660 was abusingly referencing one of the internal bus clocks, that were recently dropped from Linux (because the original implementation did not make much sense), circumventing the interconnect framework. Drop it. Signed-off-by: Konrad Dybcio --- Documentation/devicetree/bindings/usb/qcom,dwc3.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/usb/qcom,dwc3.yaml b/Documentation/devicetree/bindings/usb/qcom,dwc3.yaml index 473c4bfaf8a2..967cc6db56fa 100644 --- a/Documentation/devicetree/bindings/usb/qcom,dwc3.yaml +++ b/Documentation/devicetree/bindings/usb/qcom,dwc3.yaml @@ -291,8 +291,8 @@ allOf: then: properties: clocks: - minItems: 5 - maxItems: 6 + minItems: 4 + maxItems: 5 clock-names: oneOf: - items: @@ -301,13 +301,11 @@ allOf: - const: iface - const: sleep - const: mock_utmi - - const: bus - items: - const: cfg_noc - const: core - const: sleep - const: mock_utmi - - const: bus - if: properties: From patchwork Wed Jan 3 20:15:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 759996 Received: from mail-ed1-f54.google.com (mail-ed1-f54.google.com [209.85.208.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 787721DA20 for ; Wed, 3 Jan 2024 20:15:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="CUcD8wsR" Received: by mail-ed1-f54.google.com with SMTP id 4fb4d7f45d1cf-5542a7f1f3cso12056716a12.2 for ; Wed, 03 Jan 2024 12:15:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1704312953; x=1704917753; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=QG+rGUp/aDbPyreho5pBvmK90jeiza6JiQ/BR4I5Rh0=; b=CUcD8wsRiXRm8uk694dGxz53rBzS8E5Nz/4HYu0rx9Wgp3IRcK16XxXtNXsg/b6GKN VEzgyuLeTLoXoAN9p9sDT9Agw7ZeQHI5Q0bC5Li2fhVAf92nVCS5j+HjPxb4qkWe/07+ J8lhucf04ZJp8jdzShh0DJdfjP9MWHo6tm/ramzycPe6ZhfMh9unIlu+lDIMv/Lwn4yQ 5SlDJXZ1Dvgd8GRZglFAafVc4xjXSp/pBnmj541ILaE0Gma6qkJHVfu2aE7Qy7TsheAy ub71iEyorLOOcoT/2Qm6VTV9fby0MIKFdFllgmZeWI3wtPdkwt89HRdIDfVw25ky83u0 FEIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704312953; x=1704917753; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QG+rGUp/aDbPyreho5pBvmK90jeiza6JiQ/BR4I5Rh0=; b=aFFYpmQ11XH+nMTMJqqXTh5PUmDZQDO8MDpdXAdX5/dQiAIhmGCSdo2nM99Q7g/fLg tZa7tj603PuiJACIBw8y5C2dKmgrzRMv1+rN7gC/FgkUsSBoLo0I+8ZmVyToFaC2hwfP rtppjHitrJRpXiOMD0emRRBlvQEQxf5UYin+lPMPNzfaOKMvBsLZsfPJCzAcRDwmvKOP wtt+0Pq88BG3dSPdfOwVq6BPpGseard4kbEXYzADsyubsZNFEB0MU4z6lZKGP7G9Pn/T sSfBvoX7cULoFndizUvxUd0i87E/gVVVEotLF4L8L+1LAuAhGucdtW0PaGpegUi/BF8Q /7XQ== X-Gm-Message-State: AOJu0Ywzyx2tTdACphTy6WubtTBUZSANDem9mUnLaOURLW/h6Aaoig4u ZF4E2p0Z2k3z5iyPSeunEwi6z+ahV8dO1w== X-Google-Smtp-Source: AGHT+IHQmGjzP5vgapA4A+rsvLd/epbRl1zsiwJh/v4sKcG8w8L/6Wy20/D3bS2kHz5i+oOyNfjbtQ== X-Received: by 2002:aa7:d997:0:b0:553:9c31:b4ab with SMTP id u23-20020aa7d997000000b005539c31b4abmr11520614eds.19.1704312953788; Wed, 03 Jan 2024 12:15:53 -0800 (PST) Received: from [10.167.154.1] (178235179036.dynamic-4-waw-k-1-3-0.vectranet.pl. [178.235.179.36]) by smtp.gmail.com with ESMTPSA id fg9-20020a056402548900b00552691fc7f9sm17549670edb.66.2024.01.03.12.15.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jan 2024 12:15:53 -0800 (PST) From: Konrad Dybcio Date: Wed, 03 Jan 2024 21:15:33 +0100 Subject: [PATCH v3 3/9] arm64: dts: qcom: msm8996: Drop RPM bus clocks Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20230721-topic-rpm_clk_cleanup-v3-3-a66e698932e3@linaro.org> References: <20230721-topic-rpm_clk_cleanup-v3-0-a66e698932e3@linaro.org> In-Reply-To: <20230721-topic-rpm_clk_cleanup-v3-0-a66e698932e3@linaro.org> To: Bjorn Andersson , Greg Kroah-Hartman , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Wesley Cheng Cc: Marijn Suijten , linux-arm-msm@vger.kernel.org, linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1704312946; l=3085; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=YxJ1U7v2W6bIKmc1zORJCie36EHFesuD+RzyvvnJwE4=; b=Ib8hCQrhv5eBT49OArc3ay46lRUDtnr9udu3AJdS6d3VAK2bMeZkXVIvdF0bukxrsE18F3G7n NAeD35/S/gBBR5+my4I/uHa0PK4B0qdbzzrwKmEVwhVxhZRsJeRajGV X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Some nodes are abusingly referencing some of the internal bus clocks, that were recently removed in Linux (because the original implementation did not make much sense), managing them as if they were the only devices on an NoC bus. These clocks are now handled from within the icc framework and are no longer registered from within the CCF. Remove them. Signed-off-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/msm8996.dtsi | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi index 8c6a7efa90c4..4f465ac573f5 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi @@ -838,9 +838,6 @@ bimc: interconnect@408000 { compatible = "qcom,msm8996-bimc"; reg = <0x00408000 0x5a000>; #interconnect-cells = <1>; - clock-names = "bus", "bus_a"; - clocks = <&rpmcc RPM_SMD_BIMC_CLK>, - <&rpmcc RPM_SMD_BIMC_A_CLK>; }; tsens0: thermal-sensor@4a9000 { @@ -891,18 +888,12 @@ cnoc: interconnect@500000 { compatible = "qcom,msm8996-cnoc"; reg = <0x00500000 0x1000>; #interconnect-cells = <1>; - clock-names = "bus", "bus_a"; - clocks = <&rpmcc RPM_SMD_CNOC_CLK>, - <&rpmcc RPM_SMD_CNOC_A_CLK>; }; snoc: interconnect@524000 { compatible = "qcom,msm8996-snoc"; reg = <0x00524000 0x1c000>; #interconnect-cells = <1>; - clock-names = "bus", "bus_a"; - clocks = <&rpmcc RPM_SMD_SNOC_CLK>, - <&rpmcc RPM_SMD_SNOC_A_CLK>; }; a0noc: interconnect@543000 { @@ -922,19 +913,14 @@ a1noc: interconnect@562000 { compatible = "qcom,msm8996-a1noc"; reg = <0x00562000 0x5000>; #interconnect-cells = <1>; - clock-names = "bus", "bus_a"; - clocks = <&rpmcc RPM_SMD_AGGR1_NOC_CLK>, - <&rpmcc RPM_SMD_AGGR1_NOC_A_CLK>; }; a2noc: interconnect@583000 { compatible = "qcom,msm8996-a2noc"; reg = <0x00583000 0x7000>; #interconnect-cells = <1>; - clock-names = "bus", "bus_a", "aggre2_ufs_axi", "ufs_axi"; - clocks = <&rpmcc RPM_SMD_AGGR2_NOC_CLK>, - <&rpmcc RPM_SMD_AGGR2_NOC_A_CLK>, - <&gcc GCC_AGGRE2_UFS_AXI_CLK>, + clock-names = "aggre2_ufs_axi", "ufs_axi"; + clocks = <&gcc GCC_AGGRE2_UFS_AXI_CLK>, <&gcc GCC_UFS_AXI_CLK>; }; @@ -942,19 +928,14 @@ mnoc: interconnect@5a4000 { compatible = "qcom,msm8996-mnoc"; reg = <0x005a4000 0x1c000>; #interconnect-cells = <1>; - clock-names = "bus", "bus_a", "iface"; - clocks = <&rpmcc RPM_SMD_MMAXI_CLK>, - <&rpmcc RPM_SMD_MMAXI_A_CLK>, - <&mmcc AHB_CLK_SRC>; + clock-names = "iface"; + clocks = <&mmcc AHB_CLK_SRC>; }; pnoc: interconnect@5c0000 { compatible = "qcom,msm8996-pnoc"; reg = <0x005c0000 0x3000>; #interconnect-cells = <1>; - clock-names = "bus", "bus_a"; - clocks = <&rpmcc RPM_SMD_PCNOC_CLK>, - <&rpmcc RPM_SMD_PCNOC_A_CLK>; }; tcsr_mutex: hwlock@740000 { From patchwork Wed Jan 3 20:15:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 759995 Received: from mail-lf1-f47.google.com (mail-lf1-f47.google.com [209.85.167.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 113651DDE6 for ; Wed, 3 Jan 2024 20:15:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="j0n2mIwV" Received: by mail-lf1-f47.google.com with SMTP id 2adb3069b0e04-50e7b273352so7492764e87.1 for ; Wed, 03 Jan 2024 12:15:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1704312957; x=1704917757; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=WlRGkSxspqLt8e6uj4TsPbjrXxLpOwfPHKo5tpzsP1U=; b=j0n2mIwVTvGSqDWyYser0LZwVW95yXczmYnenMlGuJOClM7NXi+3c8E/gUopyfkB7n idLW0Y/ECQC8kzuMvNbI2v8XIes6SWAR5FtfH67pJ/N7gFEQoYJCdwTgIEx0TfWpl/Nt OrOnAIg8lYGDWrLDGsWy6S9KvRMBo8bKYPghWHgLLT08utjbfyd+oRJsqFDV4euUB4m+ YKpyR2Ee3mRfgvzI+GihQsDBaLGDIF6f7oJT5IbMIIoINGSyC1T/0AMYpFLAxQvfKsJE oBUMjZfF9fDraSKyd+dflxywqoY6u7NQF+Z5zGlMGeCPLdKn8Q20kL+K5f9Z1STxYMlM d0hA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704312957; x=1704917757; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WlRGkSxspqLt8e6uj4TsPbjrXxLpOwfPHKo5tpzsP1U=; b=vZKG1+ngnuKbb2Z6h5EPWRblB7QJy/ozQeA+bgGUCvVtgEnNfOHGvR0+BqSw9j6gyL F4ZghLMMBy9Ox61q5kMebQydTWybBnlSLeHzYCJOvihGuoGzBhgW+017PqFDog46y8Xc xko5T+WSSl5/32U0HJthW4puiybHMtfin3VNOebPoh44KstLN1ZzK76Id6MwGfTrwxwo wdx5LyqBGhW2d0oMDjuvd31Xl5sgljLcyqyHGnGNIEx1HB1WM+IDRHJtMrH3l/gVfJ+f wVZoQbnw42TwN+WRBPyO8d80AWm+IEpkMITnpX90R+ks2zIBDt2HukyMCc5qTq8QCwES sEug== X-Gm-Message-State: AOJu0Yz1RhRwlMDy8z9PAp0IqvLngo7NMZPLuzfRHTuJfHCZAHWTgkZp SY0hPTKEHyyueZ9lMmmiGPbHhYs1QRM10Q== X-Google-Smtp-Source: AGHT+IEVvy0cSxkpkQE7xYVxHf/U0MKSkUruQtZANnzecQeQ2YZwnD/BWk8zALBpd1fT9kVrswLqCw== X-Received: by 2002:ac2:58d7:0:b0:50e:2737:f603 with SMTP id u23-20020ac258d7000000b0050e2737f603mr7182940lfo.48.1704312956978; Wed, 03 Jan 2024 12:15:56 -0800 (PST) Received: from [10.167.154.1] (178235179036.dynamic-4-waw-k-1-3-0.vectranet.pl. [178.235.179.36]) by smtp.gmail.com with ESMTPSA id fg9-20020a056402548900b00552691fc7f9sm17549670edb.66.2024.01.03.12.15.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jan 2024 12:15:56 -0800 (PST) From: Konrad Dybcio Date: Wed, 03 Jan 2024 21:15:35 +0100 Subject: [PATCH v3 5/9] arm64: dts: qcom: sdm630: Drop RPM bus clocks Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20230721-topic-rpm_clk_cleanup-v3-5-a66e698932e3@linaro.org> References: <20230721-topic-rpm_clk_cleanup-v3-0-a66e698932e3@linaro.org> In-Reply-To: <20230721-topic-rpm_clk_cleanup-v3-0-a66e698932e3@linaro.org> To: Bjorn Andersson , Greg Kroah-Hartman , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Wesley Cheng Cc: Marijn Suijten , linux-arm-msm@vger.kernel.org, linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1704312946; l=5031; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=cl8sg1LTCxzGU52mzB+vk83BznWR80LOUN+g9wXpRf0=; b=pvj8+pAQlY7Mrw9NDRswB7bRzDGoa0CzPM1aqi5SgUUCLigue33wE/7OY8OyV9EaJGEsyVmEu RxTOKHepsBQCfIH8MRcYuTLSVHAyZ3EilGt6Q2fSgp7YQK+vvmOC7jk X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Some nodes are abusingly referencing some of the internal bus clocks, that were recently removed in Linux (because the original implementation did not make much sense), managing them as if they were the only devices on an NoC bus. These clocks are now handled from within the icc framework and are no longer registered from within the CCF. Remove them. Reviewed-by: Marijn Suijten Signed-off-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sdm630.dtsi | 53 ++++++++---------------------------- 1 file changed, 12 insertions(+), 41 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sdm630.dtsi b/arch/arm64/boot/dts/qcom/sdm630.dtsi index 775700f78e0f..513fe5e76b68 100644 --- a/arch/arm64/boot/dts/qcom/sdm630.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm630.dtsi @@ -606,9 +606,6 @@ bimc: interconnect@1008000 { compatible = "qcom,sdm660-bimc"; reg = <0x01008000 0x78000>; #interconnect-cells = <1>; - clock-names = "bus", "bus_a"; - clocks = <&rpmcc RPM_SMD_BIMC_CLK>, - <&rpmcc RPM_SMD_BIMC_A_CLK>; }; restart@10ac000 { @@ -620,28 +617,17 @@ cnoc: interconnect@1500000 { compatible = "qcom,sdm660-cnoc"; reg = <0x01500000 0x10000>; #interconnect-cells = <1>; - clock-names = "bus", "bus_a"; - clocks = <&rpmcc RPM_SMD_CNOC_CLK>, - <&rpmcc RPM_SMD_CNOC_A_CLK>; }; snoc: interconnect@1626000 { compatible = "qcom,sdm660-snoc"; reg = <0x01626000 0x7090>; #interconnect-cells = <1>; - clock-names = "bus", "bus_a"; - clocks = <&rpmcc RPM_SMD_SNOC_CLK>, - <&rpmcc RPM_SMD_SNOC_A_CLK>; }; anoc2_smmu: iommu@16c0000 { compatible = "qcom,sdm630-smmu-v2", "qcom,smmu-v2"; reg = <0x016c0000 0x40000>; - - assigned-clocks = <&rpmcc RPM_SMD_AGGR2_NOC_CLK>; - assigned-clock-rates = <1000>; - clocks = <&rpmcc RPM_SMD_AGGR2_NOC_CLK>; - clock-names = "bus"; #global-interrupts = <2>; #iommu-cells = <1>; @@ -686,16 +672,12 @@ a2noc: interconnect@1704000 { compatible = "qcom,sdm660-a2noc"; reg = <0x01704000 0xc100>; #interconnect-cells = <1>; - clock-names = "bus", - "bus_a", - "ipa", + clock-names = "ipa", "ufs_axi", "aggre2_ufs_axi", "aggre2_usb3_axi", "cfg_noc_usb2_axi"; - clocks = <&rpmcc RPM_SMD_AGGR2_NOC_CLK>, - <&rpmcc RPM_SMD_AGGR2_NOC_A_CLK>, - <&rpmcc RPM_SMD_IPA_CLK>, + clocks = <&rpmcc RPM_SMD_IPA_CLK>, <&gcc GCC_UFS_AXI_CLK>, <&gcc GCC_AGGRE2_UFS_AXI_CLK>, <&gcc GCC_AGGRE2_USB3_AXI_CLK>, @@ -706,10 +688,8 @@ mnoc: interconnect@1745000 { compatible = "qcom,sdm660-mnoc"; reg = <0x01745000 0xa010>; #interconnect-cells = <1>; - clock-names = "bus", "bus_a", "iface"; - clocks = <&rpmcc RPM_SMD_MMSSNOC_AXI_CLK>, - <&rpmcc RPM_SMD_MMSSNOC_AXI_CLK_A>, - <&mmcc AHB_CLK_SRC>; + clock-names = "iface"; + clocks = <&mmcc AHB_CLK_SRC>; }; tsens: thermal-sensor@10ae000 { @@ -1186,7 +1166,9 @@ kgsl_smmu: iommu@5040000 { clocks = <&gcc GCC_GPU_CFG_AHB_CLK>, <&gcc GCC_BIMC_GFX_CLK>, <&gcc GCC_GPU_BIMC_GFX_CLK>; - clock-names = "iface", "mem", "mem_iface"; + clock-names = "iface", + "mem", + "mem_iface"; #global-interrupts = <2>; #iommu-cells = <1>; @@ -1288,20 +1270,16 @@ usb3: usb@a8f8800 { <&gcc GCC_USB30_MASTER_CLK>, <&gcc GCC_AGGRE2_USB3_AXI_CLK>, <&gcc GCC_USB30_SLEEP_CLK>, - <&gcc GCC_USB30_MOCK_UTMI_CLK>, - <&rpmcc RPM_SMD_AGGR2_NOC_CLK>; + <&gcc GCC_USB30_MOCK_UTMI_CLK>; clock-names = "cfg_noc", "core", "iface", "sleep", - "mock_utmi", - "bus"; + "mock_utmi"; assigned-clocks = <&gcc GCC_USB30_MOCK_UTMI_CLK>, - <&gcc GCC_USB30_MASTER_CLK>, - <&rpmcc RPM_SMD_AGGR2_NOC_CLK>; - assigned-clock-rates = <19200000>, <120000000>, - <19200000>; + <&gcc GCC_USB30_MASTER_CLK>; + assigned-clock-rates = <19200000>, <120000000>; interrupts = , ; @@ -2204,10 +2182,9 @@ mmss_smmu: iommu@cd00000 { clocks = <&mmcc MNOC_AHB_CLK>, <&mmcc BIMC_SMMU_AHB_CLK>, - <&rpmcc RPM_SMD_MMSSNOC_AXI_CLK>, <&mmcc BIMC_SMMU_AXI_CLK>; clock-names = "iface-mm", "iface-smmu", - "bus-mm", "bus-smmu"; + "bus-smmu"; #global-interrupts = <2>; #iommu-cells = <1>; @@ -2324,12 +2301,6 @@ gnoc: interconnect@17900000 { compatible = "qcom,sdm660-gnoc"; reg = <0x17900000 0xe000>; #interconnect-cells = <1>; - /* - * This one apparently features no clocks, - * so let's not mess with the driver needlessly - */ - clock-names = "bus", "bus_a"; - clocks = <&xo_board>, <&xo_board>; }; apcs_glb: mailbox@17911000 { From patchwork Wed Jan 3 20:15:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 759994 Received: from mail-ed1-f50.google.com (mail-ed1-f50.google.com [209.85.208.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C89501F92D for ; Wed, 3 Jan 2024 20:16:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="HzbOpo2c" Received: by mail-ed1-f50.google.com with SMTP id 4fb4d7f45d1cf-555f95cc2e4so4247533a12.3 for ; Wed, 03 Jan 2024 12:16:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1704312960; x=1704917760; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=yKEX12Nc6DjhIWZVWWjaSHZ/t3DyThSHvq2IuZgMy9A=; b=HzbOpo2cyGZFFT6+WlYsqlA+5C1WdLM34TYKq76XxxqDS4JxZqOeZ/CGm7K7iTTZWF syxLV/iSHp6ZYWg4X+DALhlAsB8iIozeQ4d9dXYyZgM1Ok9yimpkPxFWa0nAr0epGjd/ hqV/8IGycZF8V0Qg82rKbYW9w5IxXi411XLCBfv7v8aWEtym8Od9oQpdm/F5BarRJwgA rKXFWILNLVxMpsITZ6lVgAR6un08Rj5Z5XsAymxq54Joq36izl8dZNp9qJ2KIMNK9ZPw vxo5GqNWkGkZ9zsxSbENE6d0Kw1IoN+2Em4oEv83PY5GH1qOHtSRgssakvim8yKNtEBj cYSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704312960; x=1704917760; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yKEX12Nc6DjhIWZVWWjaSHZ/t3DyThSHvq2IuZgMy9A=; b=O2e+xHiYfqhsi16e1/ZXOi23n5IsNMHXaikF/5qSx1hJcrJtKFnMaecofcOdOkb9AK KfIpxOH1FPG0RGju3SKoyOx3ZnKnS2fiPIswOnBnECw/b1e9Yppngpmddho8ciCiFgfS R2lAcX+A/6AA82E27WPLcCYFq8LcePvdHZV9HOMGIWHYRbuNuweadU5piMpfi5JFQufi b9gmckBbvU9uaoWuzcOZWmDb6veMpemaENpWhG8EqcA3iMY2So42GwmfoQTJFqU/oxwi rbX/+hSJ1mvQdXlcj/gqOSkTK76I/1QfuUGGINslmASze4Vkd18BoD57JZEku5Jyh42i ASUA== X-Gm-Message-State: AOJu0YworysdeyIH0l76wwH0coHs4KucuewThoWqgnMVzcEkZroyPcaY IjOn3np9vySMOmi0aEf9oAdI8nZZ5QVhrA== X-Google-Smtp-Source: AGHT+IHGBkq46I3bFv2XJv6gtLYhVLjB1InDN1jLNbKI/me2ByK5wd6gPOHoPurroyLMqn+nmLf0jQ== X-Received: by 2002:a50:eb0c:0:b0:552:d00a:2837 with SMTP id y12-20020a50eb0c000000b00552d00a2837mr10533229edp.52.1704312960076; Wed, 03 Jan 2024 12:16:00 -0800 (PST) Received: from [10.167.154.1] (178235179036.dynamic-4-waw-k-1-3-0.vectranet.pl. [178.235.179.36]) by smtp.gmail.com with ESMTPSA id fg9-20020a056402548900b00552691fc7f9sm17549670edb.66.2024.01.03.12.15.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jan 2024 12:15:59 -0800 (PST) From: Konrad Dybcio Date: Wed, 03 Jan 2024 21:15:37 +0100 Subject: [PATCH v3 7/9] arm64: dts: qcom: msm8998: Remove AGGRE2 clock from SLPI Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20230721-topic-rpm_clk_cleanup-v3-7-a66e698932e3@linaro.org> References: <20230721-topic-rpm_clk_cleanup-v3-0-a66e698932e3@linaro.org> In-Reply-To: <20230721-topic-rpm_clk_cleanup-v3-0-a66e698932e3@linaro.org> To: Bjorn Andersson , Greg Kroah-Hartman , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Wesley Cheng Cc: Marijn Suijten , linux-arm-msm@vger.kernel.org, linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1704312946; l=889; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=QUVffHTCSnWfsgGf1+xud40WCLg0YN+mizl7weLMh3w=; b=F9SiuNHQoFhocMEUUpWIY06aYxFlcou+Qit2pKRbW8/aBdr8x3BX/URHRZ0Z1OVahQFaFYvZA y6LzikAvXx8DrTM0qgTxDZcR5Qu63KADCZLgPyDs/EaxS3JcT5zIS2l X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= The AGGRE2 clock is a clock for the entire AGGRE2 bus, managed from within the interconnect driver. Attaching it to SLPI was a total hack. Get rid of it. Signed-off-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/msm8998.dtsi | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi index bb591c6bf573..2793cc22d381 100644 --- a/arch/arm64/boot/dts/qcom/msm8998.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi @@ -1605,9 +1605,8 @@ remoteproc_slpi: remoteproc@5800000 { px-supply = <&vreg_lvs2a_1p8>; - clocks = <&rpmcc RPM_SMD_XO_CLK_SRC>, - <&rpmcc RPM_SMD_AGGR2_NOC_CLK>; - clock-names = "xo", "aggre2"; + clocks = <&rpmcc RPM_SMD_XO_CLK_SRC>; + clock-names = "xo"; memory-region = <&slpi_mem>; From patchwork Wed Jan 3 20:15:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 759993 Received: from mail-lf1-f44.google.com (mail-lf1-f44.google.com [209.85.167.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2AA66200DB for ; Wed, 3 Jan 2024 20:16:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="yaH2ymto" Received: by mail-lf1-f44.google.com with SMTP id 2adb3069b0e04-50e72e3d435so8342887e87.2 for ; Wed, 03 Jan 2024 12:16:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1704312963; x=1704917763; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=agWOk7w6rgV8y2OB/j9TiP5HID7PZwKq37+MydcMd3Q=; b=yaH2ymtosQorCjffDM2nq133azvGr/KkHcFP2jkaXGKV3hh+uqJV5wI42eNBMnTHGb tEjGWN3xgf8s07+C0L4KsA+8tSh1gPVHuUh+JlFWUJnEUcnXwCvi1yta/ZsFV1qGDn0l upDS8XYcVQ7PcsSSHr+15vt9k5GlzE0x/u0fM6d6SWDpSOtyu1KufVMOv7DaEZcJDnuK DfVAgLpog2eZUTtufVi2SR9N71gZF/s9w6z2AVrp3LU7J43qW1t2w+Aqdqj7JH46ZE/2 QDlhqoKKNSEgTmgmm6ew9kcZWmWInVbqCHd1iLDFGu/URiotvGZmVUsBl2elb+ir2P2U mlzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704312963; x=1704917763; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=agWOk7w6rgV8y2OB/j9TiP5HID7PZwKq37+MydcMd3Q=; b=o/9Plzt8xtaUClC66qDRdg3lYzupU8Sw2wSBlQg/ZaRw/9tawCQN+qriOdy/ZU/t0T DitzQxW7lIww5f9EEJAhIgkEcrPkBjEhFyJ4VZ2MBbD+GMurCh/FRVXQLgB0i2Hbc9k7 3amNctNWwwUIiDMJAV1x8JJgIchLwyNA0wLyYTnlvUi6WF+gmjyyTwiLVa7NO3uPsBVS LHEJ+ZqVYKWYvq2ASVSsf8lo0ise/TdQJSGr6FMYROBQUNq8+4gVbxtBKeejUnyNQHPt WpgvqO8sdX3CwuLFtJu5yyFbHU6hKVfqTTeokh/FIbcmcLXBJqYV+7OpyXQq/+BqCOgm ushA== X-Gm-Message-State: AOJu0YyIOvCu0jxveHQiB91iPODefXnWjLhT5mF/YsM0f+/FK827wpdE E6hZl7bR1+ZTkAikzLgZ2wDE62AoOHvvbQ== X-Google-Smtp-Source: AGHT+IHKQKRuYd+I0nrZXegy4ZNvuCWzu8ez/JtqTR3BixAbs6pNVBJay8L2h0a30COQ6YXXT35IFg== X-Received: by 2002:ac2:41c2:0:b0:50e:7044:704b with SMTP id d2-20020ac241c2000000b0050e7044704bmr4312375lfi.90.1704312963418; Wed, 03 Jan 2024 12:16:03 -0800 (PST) Received: from [10.167.154.1] (178235179036.dynamic-4-waw-k-1-3-0.vectranet.pl. [178.235.179.36]) by smtp.gmail.com with ESMTPSA id fg9-20020a056402548900b00552691fc7f9sm17549670edb.66.2024.01.03.12.16.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jan 2024 12:16:03 -0800 (PST) From: Konrad Dybcio Date: Wed, 03 Jan 2024 21:15:39 +0100 Subject: [PATCH v3 9/9] arm64: dts: qcom: msm8996: Remove PNoC clock from MSS Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20230721-topic-rpm_clk_cleanup-v3-9-a66e698932e3@linaro.org> References: <20230721-topic-rpm_clk_cleanup-v3-0-a66e698932e3@linaro.org> In-Reply-To: <20230721-topic-rpm_clk_cleanup-v3-0-a66e698932e3@linaro.org> To: Bjorn Andersson , Greg Kroah-Hartman , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Wesley Cheng Cc: Marijn Suijten , linux-arm-msm@vger.kernel.org, linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1704312946; l=1234; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=lDN9I443Hl2d8DVCOQ4aNKeHtWkZFlxqcP4xR6KB6zk=; b=EL7JckzCpuqfY1C5Jg62k+EicmGHKeLrQolwseYXNXDeyuOumzO8IUKBRA1/gjGZHSoJP9ld0 vGGnQXQ6jTrDDzjCYW3tjwB9ltzeS8AaO4BPUKpSSvZ2h7SNgJOFm1t X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= The PNoC clock is a clock for the entire PNoC bus, managed from within the interconnect driver. Attaching it to MSS was a total hack. Get rid of it and take the liberty to make the clock-names entries more readable. Signed-off-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/msm8996.dtsi | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi index 174eb410824b..8d41ed261adf 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi @@ -2513,10 +2513,15 @@ mss_pil: remoteproc@2080000 { <&gcc GCC_MSS_GPLL0_DIV_CLK>, <&gcc GCC_MSS_SNOC_AXI_CLK>, <&gcc GCC_MSS_MNOC_BIMC_AXI_CLK>, - <&rpmcc RPM_SMD_PCNOC_CLK>, <&rpmcc RPM_SMD_QDSS_CLK>; - clock-names = "iface", "bus", "mem", "xo", "gpll0_mss", - "snoc_axi", "mnoc_axi", "pnoc", "qdss"; + clock-names = "iface", + "bus", + "mem", + "xo", + "gpll0_mss", + "snoc_axi", + "mnoc_axi", + "qdss"; resets = <&gcc GCC_MSS_RESTART>; reset-names = "mss_restart";