Merge tag 'soc-dt-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
[sfrench/cifs-2.6.git] / arch / arm64 / boot / dts / qcom / sm8550.dtsi
index 558cbc4307080407e63a63533ed634b31c12bec6..41d60af93692009e269ad92d844a0a76e4c34077 100644 (file)
@@ -4,7 +4,9 @@
  */
 
 #include <dt-bindings/clock/qcom,rpmh.h>
+#include <dt-bindings/clock/qcom,sm8450-videocc.h>
 #include <dt-bindings/clock/qcom,sm8550-gcc.h>
+#include <dt-bindings/clock/qcom,sm8550-gpucc.h>
 #include <dt-bindings/clock/qcom,sm8550-tcsr.h>
 #include <dt-bindings/clock/qcom,sm8550-dispcc.h>
 #include <dt-bindings/dma/qcom-gpi.h>
                };
 
                cryptobam: dma-controller@1dc4000 {
-                       compatible = "qcom,bam-v1.7.0";
+                       compatible = "qcom,bam-v1.7.4", "qcom,bam-v1.7.0";
                        reg = <0x0 0x01dc4000 0x0 0x28000>;
                        interrupts = <GIC_SPI 272 IRQ_TYPE_LEVEL_HIGH>;
                        #dma-cells = <1>;
                                 <&apps_smmu 0x481 0x0>;
                };
 
-               crypto: crypto@1de0000 {
+               crypto: crypto@1dfa000 {
                        compatible = "qcom,sm8550-qce", "qcom,sm8150-qce", "qcom,qce";
                        reg = <0x0 0x01dfa000 0x0 0x6000>;
                        dmas = <&cryptobam 4>, <&cryptobam 5>;
                        #reset-cells = <1>;
                };
 
+               gpucc: clock-controller@3d90000 {
+                       compatible = "qcom,sm8550-gpucc";
+                       reg = <0 0x03d90000 0 0xa000>;
+                       clocks = <&bi_tcxo_div2>,
+                                <&gcc GCC_GPU_GPLL0_CLK_SRC>,
+                                <&gcc GCC_GPU_GPLL0_DIV_CLK_SRC>;
+                       #clock-cells = <1>;
+                       #reset-cells = <1>;
+                       #power-domain-cells = <1>;
+               };
+
                remoteproc_mpss: remoteproc@4080000 {
                        compatible = "qcom,sm8550-mpss-pas";
                        reg = <0x0 0x04080000 0x0 0x4040>;
                        };
                };
 
+               videocc: clock-controller@aaf0000 {
+                       compatible = "qcom,sm8550-videocc";
+                       reg = <0 0x0aaf0000 0 0x10000>;
+                       clocks = <&bi_tcxo_div2>,
+                                <&gcc GCC_VIDEO_AHB_CLK>;
+                       power-domains = <&rpmhpd SM8550_MMCX>;
+                       required-opps = <&rpmhpd_opp_low_svs>;
+                       #clock-cells = <1>;
+                       #reset-cells = <1>;
+                       #power-domain-cells = <1>;
+               };
+
                mdss: display-subsystem@ae00000 {
                        compatible = "qcom,sm8550-mdss";
                        reg = <0 0x0ae00000 0 0x1000>;
                                                        remote-endpoint = <&mdss_dsi1_in>;
                                                };
                                        };
+
+                                       port@2 {
+                                               reg = <2>;
+                                               dpu_intf0_out: endpoint {
+                                                       remote-endpoint = <&mdss_dp0_in>;
+                                               };
+                                       };
                                };
 
                                mdp_opp_table: opp-table {
                                };
                        };
 
+                       mdss_dp0: displayport-controller@ae90000 {
+                               compatible = "qcom,sm8550-dp", "qcom,sm8350-dp";
+                               reg = <0 0xae90000 0 0x200>,
+                                     <0 0xae90200 0 0x200>,
+                                     <0 0xae90400 0 0xc00>,
+                                     <0 0xae91000 0 0x400>,
+                                     <0 0xae91400 0 0x400>;
+                               interrupt-parent = <&mdss>;
+                               interrupts = <12>;
+                               clocks = <&dispcc DISP_CC_MDSS_AHB_CLK>,
+                                        <&dispcc DISP_CC_MDSS_DPTX0_AUX_CLK>,
+                                        <&dispcc DISP_CC_MDSS_DPTX0_LINK_CLK>,
+                                        <&dispcc DISP_CC_MDSS_DPTX0_LINK_INTF_CLK>,
+                                        <&dispcc DISP_CC_MDSS_DPTX0_PIXEL0_CLK>;
+                               clock-names = "core_iface",
+                                             "core_aux",
+                                             "ctrl_link",
+                                             "ctrl_link_iface",
+                                             "stream_pixel";
+
+                               assigned-clocks = <&dispcc DISP_CC_MDSS_DPTX0_LINK_CLK_SRC>,
+                                                 <&dispcc DISP_CC_MDSS_DPTX0_PIXEL0_CLK_SRC>;
+                               assigned-clock-parents = <&usb_dp_qmpphy QMP_USB43DP_DP_LINK_CLK>,
+                                                        <&usb_dp_qmpphy QMP_USB43DP_DP_VCO_DIV_CLK>;
+
+                               phys = <&usb_dp_qmpphy QMP_USB43DP_DP_PHY>;
+                               phy-names = "dp";
+
+                               #sound-dai-cells = <0>;
+
+                               operating-points-v2 = <&dp_opp_table>;
+                               power-domains = <&rpmhpd SM8550_MMCX>;
+
+                               status = "disabled";
+
+                               ports {
+                                       #address-cells = <1>;
+                                       #size-cells = <0>;
+
+                                       port@0 {
+                                               reg = <0>;
+                                               mdss_dp0_in: endpoint {
+                                                       remote-endpoint = <&dpu_intf0_out>;
+                                               };
+                                       };
+
+                                       port@1 {
+                                               reg = <1>;
+                                               mdss_dp0_out: endpoint {
+                                               };
+                                       };
+                               };
+
+                               dp_opp_table: opp-table {
+                                       compatible = "operating-points-v2";
+
+                                       opp-162000000 {
+                                               opp-hz = /bits/ 64 <162000000>;
+                                               required-opps = <&rpmhpd_opp_low_svs_d1>;
+                                       };
+
+                                       opp-270000000 {
+                                               opp-hz = /bits/ 64 <270000000>;
+                                               required-opps = <&rpmhpd_opp_low_svs>;
+                                       };
+
+                                       opp-540000000 {
+                                               opp-hz = /bits/ 64 <540000000>;
+                                               required-opps = <&rpmhpd_opp_svs_l1>;
+                                       };
+
+                                       opp-810000000 {
+                                               opp-hz = /bits/ 64 <810000000>;
+                                               required-opps = <&rpmhpd_opp_nom>;
+                                       };
+                               };
+                       };
+
                        mdss_dsi0: dsi@ae94000 {
                                compatible = "qcom,sm8550-dsi-ctrl", "qcom,mdss-dsi-ctrl";
                                reg = <0 0x0ae94000 0 0x400>;
                                 <&mdss_dsi0_phy 1>,
                                 <&mdss_dsi1_phy 0>,
                                 <&mdss_dsi1_phy 1>,
-                                <0>, /* dp0 */
-                                <0>,
+                                <&usb_dp_qmpphy QMP_USB43DP_DP_LINK_CLK>,
+                                <&usb_dp_qmpphy QMP_USB43DP_DP_VCO_DIV_CLK>,
                                 <0>, /* dp1 */
                                 <0>,
                                 <0>, /* dp2 */
                        #clock-cells = <1>;
                        #reset-cells = <1>;
                        #power-domain-cells = <1>;
-                       status = "disabled";
                };
 
                usb_1_hsphy: phy@88e3000 {
 
                        resets = <&gcc GCC_USB30_PRIM_BCR>;
 
+                       interconnects = <&aggre1_noc MASTER_USB3_0 0 &mc_virt SLAVE_EBI1 0>,
+                                       <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_USB3_0 0>;
+                       interconnect-names = "usb-ddr", "apps-usb";
+
                        status = "disabled";
 
                        usb_1_dwc3: usb@a600000 {
                        #interrupt-cells = <4>;
                };
 
-               tlmm: pinctrl@f000000 {
+               tlmm: pinctrl@f100000 {
                        compatible = "qcom,sm8550-tlmm";
                        reg = <0 0x0f100000 0 0x300000>;
                        interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>;
                        qcom,drv-id = <2>;
                        qcom,tcs-config = <ACTIVE_TCS    3>, <SLEEP_TCS     2>,
                                          <WAKE_TCS      2>, <CONTROL_TCS   0>;
+                       power-domains = <&CLUSTER_PD>;
 
                        apps_bcm_voter: bcm-voter {
                                compatible = "qcom,bcm-voter";
                                rpmhpd_opp_table: opp-table {
                                        compatible = "operating-points-v2";
 
-                                       rpmhpd_opp_ret: opp1 {
+                                       rpmhpd_opp_ret: opp-16 {
                                                opp-level = <RPMH_REGULATOR_LEVEL_RETENTION>;
                                        };
 
-                                       rpmhpd_opp_min_svs: opp2 {
+                                       rpmhpd_opp_min_svs: opp-48 {
                                                opp-level = <RPMH_REGULATOR_LEVEL_MIN_SVS>;
                                        };
 
-                                       rpmhpd_opp_low_svs: opp3 {
+                                       rpmhpd_opp_low_svs_d2: opp-52 {
+                                               opp-level = <RPMH_REGULATOR_LEVEL_LOW_SVS_D2>;
+                                       };
+
+                                       rpmhpd_opp_low_svs_d1: opp-56 {
+                                               opp-level = <RPMH_REGULATOR_LEVEL_LOW_SVS_D1>;
+                                       };
+
+                                       rpmhpd_opp_low_svs_d0: opp-60 {
+                                               opp-level = <RPMH_REGULATOR_LEVEL_LOW_SVS_D0>;
+                                       };
+
+                                       rpmhpd_opp_low_svs: opp-64 {
                                                opp-level = <RPMH_REGULATOR_LEVEL_LOW_SVS>;
                                        };
 
-                                       rpmhpd_opp_svs: opp4 {
+                                       rpmhpd_opp_low_svs_l1: opp-80 {
+                                               opp-level = <RPMH_REGULATOR_LEVEL_LOW_SVS_L1>;
+                                       };
+
+                                       rpmhpd_opp_svs: opp-128 {
                                                opp-level = <RPMH_REGULATOR_LEVEL_SVS>;
                                        };
 
-                                       rpmhpd_opp_svs_l1: opp5 {
+                                       rpmhpd_opp_svs_l0: opp-144 {
+                                               opp-level = <RPMH_REGULATOR_LEVEL_SVS_L0>;
+                                       };
+
+                                       rpmhpd_opp_svs_l1: opp-192 {
                                                opp-level = <RPMH_REGULATOR_LEVEL_SVS_L1>;
                                        };
 
-                                       rpmhpd_opp_nom: opp6 {
+                                       rpmhpd_opp_nom: opp-256 {
                                                opp-level = <RPMH_REGULATOR_LEVEL_NOM>;
                                        };
 
-                                       rpmhpd_opp_nom_l1: opp7 {
+                                       rpmhpd_opp_nom_l1: opp-320 {
                                                opp-level = <RPMH_REGULATOR_LEVEL_NOM_L1>;
                                        };
 
-                                       rpmhpd_opp_nom_l2: opp8 {
+                                       rpmhpd_opp_nom_l2: opp-336 {
                                                opp-level = <RPMH_REGULATOR_LEVEL_NOM_L2>;
                                        };
 
-                                       rpmhpd_opp_turbo: opp9 {
+                                       rpmhpd_opp_turbo: opp-384 {
                                                opp-level = <RPMH_REGULATOR_LEVEL_TURBO>;
                                        };
 
-                                       rpmhpd_opp_turbo_l1: opp10 {
+                                       rpmhpd_opp_turbo_l1: opp-416 {
                                                opp-level = <RPMH_REGULATOR_LEVEL_TURBO_L1>;
                                        };
                                };