[PATCH v2 06/14] arm64: dts: qcom: sdm630: Drop RPM bus clocks

[Marijn Suijten]

On 2023-09-12 15:31:44, Konrad Dybcio wrote:
> 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 <konrad.dybcio at linaro.org>

This makes the USB and IOMMUs probe again on SDM630 devices like the Sony Xperia
XA2 Ultra.  Thanks!

Reviewed-by: Marijn Suijten <marijn.suijten at somainline.org>

+cc Dmitry who was talking to me about this SoC.

> ---
>  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 at 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 at 10ac000 {
> @@ -619,28 +616,17 @@ cnoc: interconnect at 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 at 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 at 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 at 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 at 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 at 10ae000 {
> @@ -1228,20 +1208,16 @@ usb3: usb at 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 = <GIC_SPI 347 IRQ_TYPE_LEVEL_HIGH>,
>  				     <GIC_SPI 243 IRQ_TYPE_LEVEL_HIGH>;
> @@ -2144,10 +2120,9 @@ mmss_smmu: iommu at 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 at 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 at 17911000 {
> 
> -- 
> 2.42.0
>