]> Git Repo - linux.git/commitdiff
Merge tag 'qcom-arm64-for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom...
authorOlof Johansson <[email protected]>
Tue, 25 Jun 2019 11:31:37 +0000 (04:31 -0700)
committerOlof Johansson <[email protected]>
Tue, 25 Jun 2019 11:31:37 +0000 (04:31 -0700)
Qualcomm ARM64 Updates for v5.3

* Switch to use second gen PON on PM8998
* Add PSCI cupidle states for MSM8996, MSM8998,and SDM845
* Add MSM8996 UFS phy reset controller
* Add propre cpu capacity scaling on MSM8996
* Fixups for APR domain, legacy clocks, and PSCI entry latency on MSM8996
* Enable SMMUs on MSM8996
* Add Dragonboard 845C
* Add Q6V5, GPU, GMU, and AOSS QMP node on SDM845
* Fixup CPU topology on SDM845
* Change USB1 to be peripheral on SDM845 MTP
* Add PCIe Phy, RC nodes, ANOC1 SMMU, and RPMPD node on MSM8998
* Update coresight bindings for MSM8916
* Update idle state names and entry-method on MSM8916
* Add PCIe, RPMPD, LPASS, Q6, TCSR, TuringCC, PSCI cpuidle states,
  and CDSP on QCS404
* Add reset-cells property to QCS404 GCC node
* Fixup s3 max voltage, l3 min voltage, drive strength typo, and
  s3 supply definition on QCS404-evb
* Fixup ADC outputs and VADC calibration on PMS405

* tag 'qcom-arm64-for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: (39 commits)
  arm64: dts: qcom: qcs404-evb: fix vdd_apc supply
  arm64: dts: qcom: pm8998: Use qcom,pm8998-pon binding for second gen pon
  arm64: dts: qcom: msm8996: Enable SMMUs
  arm64: dts: qcom: msm8996: Correct apr-domain property
  arm64: dts: qcom: Add Dragonboard 845c
  arm64: dts: qcom: qcs404-evb: Enable PCIe
  arm64: dts: qcom: qcs404: Add PCIe related nodes
  arm64: dts: qcom: msm8998: Add PCIe PHY and RC nodes
  arm64: dts: qcom: msm8998: Add ANOC1 SMMU node
  arm64: dts: qcom: msm8996: Stop using legacy clock names
  arm64: dts: msm8996: fix PSCI entry-latency-us
  arm64: dts: qcom: msm8998: Add PSCI cpuidle low power states
  arm64: dts: qcom: sdm845: Add Q6V5 MSS node
  arm64: dts: qcom: Add AOSS QMP node
  arm64: dts: qcom-qcs404: Add reset-cells to GCC node
  arm64: dts: qcom-msm8916: Update coresight DT bindings
  arm64: dts: qcom: msm8998: Add rpmpd node
  arm64: dts: qcom: qcs404: Add rpmpd node
  arm64: dts: qcom: qcs404: Move lpass and q6 into soc
  arm64: dts: qcom: qcs404: Fully describe the CDSP
  ...

Signed-off-by: Olof Johansson <[email protected]>
1  2 
arch/arm64/boot/dts/qcom/msm8916.dtsi
arch/arm64/boot/dts/qcom/msm8996.dtsi

index dacd465fc62e4952848cde527dc5c3bdccef0351,689a2e452406563275cb23e1822db587c2cd15f8..5ea9fb8f2f87dfc9fcdc2876094579e1f7b5a254
@@@ -1,6 -1,14 +1,6 @@@
 +// SPDX-License-Identifier: GPL-2.0-only
  /*
   * Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.
 - *
 - * This program is free software; you can redistribute it and/or modify
 - * it under the terms of the GNU General Public License version 2 and
 - * only version 2 as published by the Free Software Foundation.
 - *
 - * This program is distributed in the hope that it will be useful,
 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 - * GNU General Public License for more details.
   */
  
  #include <dt-bindings/interrupt-controller/arm-gic.h>
                        reg = <0x0>;
                        next-level-cache = <&L2_0>;
                        enable-method = "psci";
-                       cpu-idle-states = <&CPU_SPC>;
+                       cpu-idle-states = <&CPU_SLEEP_0>;
                        clocks = <&apcs>;
                        operating-points-v2 = <&cpu_opp_table>;
                        #cooling-cells = <2>;
                        reg = <0x1>;
                        next-level-cache = <&L2_0>;
                        enable-method = "psci";
-                       cpu-idle-states = <&CPU_SPC>;
+                       cpu-idle-states = <&CPU_SLEEP_0>;
                        clocks = <&apcs>;
                        operating-points-v2 = <&cpu_opp_table>;
                        #cooling-cells = <2>;
                        reg = <0x2>;
                        next-level-cache = <&L2_0>;
                        enable-method = "psci";
-                       cpu-idle-states = <&CPU_SPC>;
+                       cpu-idle-states = <&CPU_SLEEP_0>;
                        clocks = <&apcs>;
                        operating-points-v2 = <&cpu_opp_table>;
                        #cooling-cells = <2>;
                        reg = <0x3>;
                        next-level-cache = <&L2_0>;
                        enable-method = "psci";
-                       cpu-idle-states = <&CPU_SPC>;
+                       cpu-idle-states = <&CPU_SLEEP_0>;
                        clocks = <&apcs>;
                        operating-points-v2 = <&cpu_opp_table>;
                        #cooling-cells = <2>;
                };
  
                idle-states {
-                       CPU_SPC: spc {
+                       entry-method = "psci";
+                       CPU_SLEEP_0: cpu-sleep-0 {
                                compatible = "arm,idle-state";
+                               idle-state-name = "standalone-power-collapse";
                                arm,psci-suspend-param = <0x40000002>;
                                entry-latency-us = <130>;
                                exit-latency-us = <150>;
                };
  
                funnel@821000 {
-                       compatible = "arm,coresight-funnel", "arm,primecell";
+                       compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
                        reg = <0x821000 0x1000>;
  
                        clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
                };
  
                funnel@841000 { /* APSS funnel only 4 inputs are used */
-                       compatible = "arm,coresight-funnel", "arm,primecell";
+                       compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
                        reg = <0x841000 0x1000>;
  
                        clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
index 942465d8aeb7c35d8de085a870bbe75f24a7b2e3,f8bc65ff9900fe9b41f468769137eb37cb478639..96c0a481f454eaeea74536dccec9f65f7aa73c03
@@@ -1,5 -1,13 +1,5 @@@
 +// SPDX-License-Identifier: GPL-2.0-only
  /* Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.
 - *
 - * This program is free software; you can redistribute it and/or modify
 - * it under the terms of the GNU General Public License version 2 and
 - * only version 2 as published by the Free Software Foundation.
 - *
 - * This program is distributed in the hope that it will be useful,
 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 - * GNU General Public License for more details.
   */
  
  #include <dt-bindings/interrupt-controller/arm-gic.h>
                        compatible = "qcom,kryo";
                        reg = <0x0 0x0>;
                        enable-method = "psci";
+                       cpu-idle-states = <&CPU_SLEEP_0>;
+                       capacity-dmips-mhz = <1024>;
                        next-level-cache = <&L2_0>;
                        L2_0: l2-cache {
                              compatible = "cache";
                        compatible = "qcom,kryo";
                        reg = <0x0 0x1>;
                        enable-method = "psci";
+                       cpu-idle-states = <&CPU_SLEEP_0>;
+                       capacity-dmips-mhz = <1024>;
                        next-level-cache = <&L2_0>;
                };
  
                        compatible = "qcom,kryo";
                        reg = <0x0 0x100>;
                        enable-method = "psci";
+                       cpu-idle-states = <&CPU_SLEEP_0>;
+                       capacity-dmips-mhz = <1024>;
                        next-level-cache = <&L2_1>;
                        L2_1: l2-cache {
                              compatible = "cache";
                        compatible = "qcom,kryo";
                        reg = <0x0 0x101>;
                        enable-method = "psci";
+                       cpu-idle-states = <&CPU_SLEEP_0>;
+                       capacity-dmips-mhz = <1024>;
                        next-level-cache = <&L2_1>;
                };
  
                                };
                        };
                };
+               idle-states {
+                       entry-method = "psci";
+                       CPU_SLEEP_0: cpu-sleep-0 {
+                               compatible = "arm,idle-state";
+                               idle-state-name = "standalone-power-collapse";
+                               arm,psci-suspend-param = <0x00000004>;
+                               entry-latency-us = <130>;
+                               exit-latency-us = <80>;
+                               min-residency-us = <300>;
+                       };
+               };
        };
  
        thermal-zones {
                        clock-names = "ref_clk_src", "ref_clk";
                        clocks = <&rpmcc RPM_SMD_LN_BB_CLK>,
                                 <&gcc GCC_UFS_CLKREF_CLK>;
+                       resets = <&ufshc 0>;
                        status = "disabled";
                };
  
-               ufshc@624000 {
+               ufshc: ufshc@624000 {
                        compatible = "qcom,ufshc";
                        reg = <0x624000 0x2500>;
                        interrupts = <GIC_SPI 265 IRQ_TYPE_LEVEL_HIGH>;
                                <0 0>;
  
                        lanes-per-direction = <1>;
+                       #reset-cells = <1>;
                        status = "disabled";
  
                        ufs_variant {
                        clock-names = "iface",
                                      "bus";
                        #iommu-cells = <1>;
-                       status = "disabled";
                };
  
                camss: camss@a00000 {
                        clock-names = "iface", "bus";
  
                        power-domains = <&mmcc GPU_GDSC>;
-                       status = "disabled";
                };
  
                mdp_smmu: arm,smmu@d00000 {
                        clock-names = "iface", "bus";
  
                        power-domains = <&mmcc MDSS_GDSC>;
-                       status = "disabled";
                };
  
                lpass_q6_smmu: arm,smmu-lpass_q6@1600000 {
                        clocks = <&gcc GCC_HLOS1_VOTE_LPASS_CORE_SMMU_CLK>,
                                 <&gcc GCC_HLOS1_VOTE_LPASS_ADSP_SMMU_CLK>;
                        clock-names = "iface", "bus";
-                       status = "disabled";
                };
  
                agnoc@0 {
                        #interrupt-cells = <1>;
  
                        clocks = <&mmcc MDSS_AHB_CLK>;
-                       clock-names = "iface_clk";
+                       clock-names = "iface";
  
                        #address-cells = <1>;
                        #size-cells = <1>;
                                         <&mmcc MDSS_MDP_CLK>,
                                         <&mmcc SMMU_MDP_AXI_CLK>,
                                         <&mmcc MDSS_VSYNC_CLK>;
-                               clock-names = "iface_clk",
-                                             "bus_clk",
-                                             "core_clk",
-                                             "iommu_clk",
-                                             "vsync_clk";
+                               clock-names = "iface",
+                                             "bus",
+                                             "core",
+                                             "iommu",
+                                             "vsync";
  
                                iommus = <&mdp_smmu 0>;
  
                                         <&mmcc MDSS_HDMI_AHB_CLK>,
                                         <&mmcc MDSS_EXTPCLK_CLK>;
                                clock-names =
-                                       "mdp_core_clk",
-                                       "iface_clk",
-                                       "core_clk",
-                                       "alt_iface_clk",
-                                       "extp_clk";
+                                       "mdp_core",
+                                       "iface",
+                                       "core",
+                                       "alt_iface",
+                                       "extp";
  
                                phys = <&hdmi_phy>;
                                phy-names = "hdmi_phy";
  
                                clocks = <&mmcc MDSS_AHB_CLK>,
                                         <&gcc GCC_HDMI_CLKREF_CLK>;
-                               clock-names = "iface_clk",
-                                             "ref_clk";
+                               clock-names = "iface",
+                                             "ref";
                        };
                };
        };
                                power-domains = <&gcc HLOS1_VOTE_LPASS_ADSP_GDSC>;
                                compatible = "qcom,apr-v2";
                                qcom,smd-channels = "apr_audio_svc";
-                               reg = <APR_DOMAIN_ADSP>;
+                               qcom,apr-domain = <APR_DOMAIN_ADSP>;
                                #address-cells = <1>;
                                #size-cells = <0>;
  
This page took 0.081468 seconds and 4 git commands to generate.