Squashed 'dts/upstream/' changes from aaba2d45dc2a..b35b9bd1d4ee

[thirdparty/u-boot.git] / src / arm64 / qcom / sdm630.dtsi

diff --git a/src/arm64/qcom/sdm630.dtsi b/src/arm64/qcom/sdm630.dtsi
index 775700f78e0feb8998b36aaf3e0a28ddc739e0df..513fe5e76b688ed0ace12b3804169fdb7e2c8841 100644 (file)
--- a/src/arm64/qcom/sdm630.dtsi
+++ b/src/arm64/qcom/sdm630.dtsi
@@ -606,9 +606,6 @@
                        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 @@
                        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 @@
                        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 @@
                        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 @@
                        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 @@
                                 <&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>;
@@ -2204,10 +2182,9 @@
 
                        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 @@
                        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 {