From patchwork Tue Sep 12 13:31:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 13381672 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 04731CA0ED3 for ; Tue, 12 Sep 2023 13:32:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=qvTzXqjasmVyN5Mxc6uizfU6ypSNQoVmDT35EC3f0t8=; b=HVDUHZmnC3BPHC Prm4pG19kvtyUEXjOupOjMNn7o+mvKIk/W7jQgLO/YHBFRk01gFxNAlpQGXTYfHETuHZRp2wDEQN2 fAiSjbyG5K+kFcjBBlFk3AKWlnHMKHYmPN98Svb4zV+IEwh9BPlcbIIGgluhWGhksw34t9Ka8rjXU r/zT6r1ndQDIZa7jBXc8F9GuYl0/UG5zV73k5f3QiSQLBzVS0Hd6phOFdEJ7O5LDGy7HozupeBasF Ft0EAonZv0Qvp2sKC5w3/lY2Yi9gWx3T98UdQjeiGdKQ6TlJnmXfplwKPzIEmrtdyHt4J5/c8PBxh JnEsEYA3P4P7SyAtgLNQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qg3V7-003R58-2O; Tue, 12 Sep 2023 13:32:21 +0000 Received: from mail-ed1-x534.google.com ([2a00:1450:4864:20::534]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qg3V0-003Qnj-2P for linux-arm-kernel@lists.infradead.org; Tue, 12 Sep 2023 13:32:17 +0000 Received: by mail-ed1-x534.google.com with SMTP id 4fb4d7f45d1cf-52c88a03f99so6808904a12.2 for ; Tue, 12 Sep 2023 06:32:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1694525519; x=1695130319; darn=lists.infradead.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=9cAUp6iqIfoEYwT2Ywlf4KbJQ18NYneTc7cMa1vlC9U=; b=TKPz0ELSeIZPGchI9bBGoFSwyQGRonbN0hRy7dZanvDyC8H8Eoydf7gxqpC773gD4Y kvwrpNWp6SgrGElwEV59dgsS2yYeNutzt65Gi+dMgZF3rrsPJ4cDTqkyOzfh6kXicFCJ To8lh5elpj69nZfW7vsqaIIp3g6PTXo1rDDCT5j+GLfxmVhV52tLiCfwcNlffMm43237 jOiyyANCqBbdTuaYagwKmpUwjuxYAd6MnPn5N6ghEPFmd3UD0N9B4cVa/HX/W9yTU2+Y wAxxS/hpN3p7Yz7tAJG7ayuKQw+IRKwJhSiI6KjvhR71CxePfKCUaq9dOMr4JZKiEwUQ /GuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694525519; x=1695130319; 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=9cAUp6iqIfoEYwT2Ywlf4KbJQ18NYneTc7cMa1vlC9U=; b=NqTLq196Bdpp0mJ32XLVGmcnk+BIHN8q52cgIFn/YVisbb1InCqaXf+LzUNqaodRf8 WKgVQcuXnSUlAU8L+iTf+OwW3py/ArqAeHR5KfafECGR24MGh1mPTFNPs1WN1+T8hyIl T24zr6dBBbZUBHxUxa5dj68ET2rzquLecJ5g3VaAWm6ri6IVF87/18z6O3saIMWlhYfk 9HChVZaw4KWZCp99RL+3cvpkyRyOuFPxP873/A0znw+GXd+SpOFGDK6dGwsTk0CzIGLr TkgSPK9u+gDQPTuWHXEPsr/PFXNYRcIg2/qhrLLaGYMj43b4MTCI++ek5rYJewzYtTHF EqYg== X-Gm-Message-State: AOJu0Yyy36H6QiglFxR/LGhMazRDYu6/nwJnvEeh53FxP4i9UWlXSksF 3+iawiW9wBuPtbCqwVYB/c4ZMQ== X-Google-Smtp-Source: AGHT+IHrRow731IjuVawm62DqcRXfph0ITp9wsTkE4wa3vLzsJfkUEHjGvnNV1CIX1CT9vRI7TWVMA== X-Received: by 2002:aa7:d3d1:0:b0:523:2847:fb5a with SMTP id o17-20020aa7d3d1000000b005232847fb5amr9100271edr.40.1694525518977; Tue, 12 Sep 2023 06:31:58 -0700 (PDT) Received: from [10.167.154.1] (178235177248.dynamic-4-waw-k-1-1-0.vectranet.pl. [178.235.177.248]) by smtp.gmail.com with ESMTPSA id j2-20020aa7ca42000000b0052a401d8ef6sm5983830edt.71.2023.09.12.06.31.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 06:31:58 -0700 (PDT) From: Konrad Dybcio Date: Tue, 12 Sep 2023 15:31:44 +0200 Subject: [PATCH v2 06/14] arm64: dts: qcom: sdm630: Drop RPM bus clocks MIME-Version: 1.0 Message-Id: <20230721-topic-rpm_clk_cleanup-v2-6-1e506593b1bd@linaro.org> References: <20230721-topic-rpm_clk_cleanup-v2-0-1e506593b1bd@linaro.org> In-Reply-To: <20230721-topic-rpm_clk_cleanup-v2-0-1e506593b1bd@linaro.org> To: Andy Gross , Bjorn Andersson , Mathieu Poirier , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Manivannan Sadhasivam , Sibi Sankar , Will Deacon , Robin Murphy , Joerg Roedel , Greg Kroah-Hartman , Wesley Cheng Cc: Marijn Suijten , Alexey Minnekhanov , linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, iommu@lists.linux.dev, linux-usb@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1694525501; l=4386; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=sfSwBRR5enYP/jva74He4iYb0xqA+8EzRsqTAivm8lc=; b=alB5BmdWnE9xT/JxFw3plJfN4oBVJBWyH/BVrel7Aq19GlTTN1KjMGBe4rU9ZDoyLdNTjNQGM TP7Ze06lhfbCG3qZI+o+IfoOiGCLS3T9jh2pHa0YjDzQGNiD3dTduQS X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230912_063214_800964_D8902A2A X-CRM114-Status: GOOD ( 12.68 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 Reviewed-by: Marijn Suijten --- arch/arm64/boot/dts/qcom/sdm630.dtsi | 49 +++++++----------------------------- 1 file changed, 9 insertions(+), 40 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sdm630.dtsi b/arch/arm64/boot/dts/qcom/sdm630.dtsi index ec6003212c4d..f11d2a07508c 100644 --- a/arch/arm64/boot/dts/qcom/sdm630.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm630.dtsi @@ -605,9 +605,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 { @@ -619,28 +616,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>; @@ -685,16 +671,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>, @@ -705,10 +687,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 { @@ -1228,20 +1208,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 = , ; @@ -2144,10 +2120,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>; @@ -2264,12 +2239,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 {