summaryrefslogtreecommitdiff
path: root/qcom
diff options
context:
space:
mode:
Diffstat (limited to 'qcom')
-rw-r--r--qcom/lagoon-gpu.dtsi12
-rw-r--r--qcom/msm8917-camera.dtsi8
-rw-r--r--qcom/msm8917-thermal.dtsi2
-rw-r--r--qcom/msm8917.dtsi62
-rw-r--r--qcom/msm8937.dtsi43
-rw-r--r--qcom/qm215-camera.dtsi15
-rw-r--r--qcom/qm215-pm8916.dtsi8
-rw-r--r--qcom/sdm660-mdss.dtsi6
8 files changed, 112 insertions, 44 deletions
diff --git a/qcom/lagoon-gpu.dtsi b/qcom/lagoon-gpu.dtsi
index 5349c384..1664a4d2 100644
--- a/qcom/lagoon-gpu.dtsi
+++ b/qcom/lagoon-gpu.dtsi
@@ -221,7 +221,7 @@
qcom,gpu-freq = <650000000>;
qcom,bus-freq = <10>;
qcom,bus-min = <8>;
- qcom,bus-max = <12>;
+ qcom,bus-max = <10>;
};
/* NOM */
@@ -230,7 +230,7 @@
qcom,gpu-freq = <565000000>;
qcom,bus-freq = <9>;
qcom,bus-min = <8>;
- qcom,bus-max = <11>;
+ qcom,bus-max = <10>;
};
/* SVS_L1 */
@@ -301,7 +301,7 @@
qcom,gpu-freq = <650000000>;
qcom,bus-freq = <10>;
qcom,bus-min = <8>;
- qcom,bus-max = <12>;
+ qcom,bus-max = <10>;
};
/* NOM */
@@ -310,7 +310,7 @@
qcom,gpu-freq = <565000000>;
qcom,bus-freq = <9>;
qcom,bus-min = <8>;
- qcom,bus-max = <11>;
+ qcom,bus-max = <10>;
};
/* SVS_L1 */
@@ -372,7 +372,7 @@
qcom,gpu-freq = <650000000>;
qcom,bus-freq = <10>;
qcom,bus-min = <8>;
- qcom,bus-max = <12>;
+ qcom,bus-max = <10>;
};
/* NOM */
@@ -381,7 +381,7 @@
qcom,gpu-freq = <565000000>;
qcom,bus-freq = <9>;
qcom,bus-min = <8>;
- qcom,bus-max = <11>;
+ qcom,bus-max = <10>;
};
/* SVS_L1 */
diff --git a/qcom/msm8917-camera.dtsi b/qcom/msm8917-camera.dtsi
index b72cd436..ec212307 100644
--- a/qcom/msm8917-camera.dtsi
+++ b/qcom/msm8917-camera.dtsi
@@ -308,12 +308,6 @@
qcom,scratch-buf-support;
};
- msm_cam_smmu_cb2: msm_cam_smmu_cb2 {
- compatible = "qcom,msm-cam-smmu-cb";
- label = "vfe_secure";
- qcom,secure-context;
- };
-
msm_cam_smmu_cb3: msm_cam_smmu_cb3 {
compatible = "qcom,msm-cam-smmu-cb";
iommus = <&apps_iommu 0x1c00 0x00>;
@@ -382,7 +376,7 @@
"camss_top_ahb_clk", "camss_vfe_cpp_ahb_clk",
"camss_vfe_cpp_axi_clk", "camss_vfe_cpp_clk",
"micro_iface_clk", "camss_ahb_clk";
- qcom,clock-rates = <61540000 180000000 0 0 0 180000000 0 0>;
+ qcom,src-clock-rates = <61540000 180000000 0 0 0 180000000 0 0>;
qcom,min-clock-rate = <133000000>;
resets = <&gcc GCC_CAMSS_MICRO_BCR>;
reset-names = "micro_iface_reset";
diff --git a/qcom/msm8917-thermal.dtsi b/qcom/msm8917-thermal.dtsi
index 9933847c..7135a3d0 100644
--- a/qcom/msm8917-thermal.dtsi
+++ b/qcom/msm8917-thermal.dtsi
@@ -1,6 +1,6 @@
#include <dt-bindings/thermal/thermal.h>
-&clock_cpu {
+&apsscc {
qcom,cpu-isolation {
compatible = "qcom,cpu-isolate";
cpu0_isolate: cpu0-isolate {
diff --git a/qcom/msm8917.dtsi b/qcom/msm8917.dtsi
index 40bd992f..35bb7c3e 100644
--- a/qcom/msm8917.dtsi
+++ b/qcom/msm8917.dtsi
@@ -1,6 +1,7 @@
#include "skeleton64.dtsi"
#include <dt-bindings/clock/qcom,gcc-sdm429w.h>
#include <dt-bindings/clock/mdss-28nm-pll-clk.h>
+#include <dt-bindings/clock/qcom,cpu-sdm.h>
#include <dt-bindings/clock/qcom,rpmcc.h>
#include <dt-bindings/regulator/qcom,rpm-smd-regulator.h>
#include <dt-bindings/spmi/spmi.h>
@@ -432,7 +433,7 @@
cpu-pmu {
compatible = "arm,armv8-pmuv3";
- interrupts = <1 7 0xff00>;
+ interrupts = <1 7 IRQ_TYPE_LEVEL_HIGH>;
};
slim_msm: slim@c140000 {
@@ -586,13 +587,16 @@
#clock-cells = <1>;
};
- clock_cpu: qcom,cpu-clock-8939@b111050 {
- compatible = "qcom,cpu-clock-8917";
- reg = <0xb011050 0x8>,
+ apsscc: qcom,clock-cpu@b011050 {
+ compatible = "qcom,cpu-clock-qm215";
+ reg = <0xb011050 0x8>,
+ <0xb016000 0x34>,
<0x00a412c 0x8>;
- reg-names = "apcs-c1-rcg-base", "efuse";
- qcom,num-cluster;
- vdd-c1-supply = <&apc_vreg_corner>;
+ reg-names = "apcs-c1-rcg-base",
+ "apcs_pll", "efuse";
+ cpu-vdd-supply = <&apc_vreg_corner>;
+ vdd_dig_ao-supply = <&pm8916_s1_level_ao>;
+ vdd_hf_pll-supply = <&pm8916_l7_ao>;
clocks = <&rpmcc RPM_SMD_XO_A_CLK_SRC>,
<&gcc GPLL0_AO_OUT_MAIN>;
clock-names = "xo_ao", "gpll0_ao" ;
@@ -938,7 +942,7 @@
<0x200a000 0x2100>;
reg-names = "core", "chnls", "obsrvr", "intr", "cnfg";
interrupt-names = "periph_irq";
- interrupts = <GIC_SPI 190 IRQ_TYPE_NONE>;
+ interrupts = <GIC_SPI 190 IRQ_TYPE_LEVEL_HIGH>;
qcom,ee = <0>;
qcom,channel = <0>;
#address-cells = <1>;
@@ -1269,6 +1273,42 @@
};
+ qcom,smsm {
+ compatible = "qcom,smsm";
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ qcom,ipc-1 = <&apcs 0 13>;
+ qcom,ipc-2 = <&apcs 0 9>;
+ qcom,ipc-3 = <&apcs 0 19>;
+
+ apps_smsm: apps@0 {
+ reg = <0>;
+ #qcom,smem-state-cells = <1>;
+ };
+
+ modem_smsm: modem@1 {
+ reg = <1>;
+ interrupts = <0 26 IRQ_TYPE_EDGE_RISING>;
+ interrupt-controller;
+ #interrupt-cells = <2>;
+ };
+
+ adsp_smsm: adsp@2 {
+ reg = <2>;
+ interrupts = <0 290 IRQ_TYPE_EDGE_RISING>;
+ interrupt-controller;
+ #interrupt-cells = <2>;
+ };
+
+ wcnss_smsm: wcnss@3 {
+ reg = <3>;
+ interrupts = <0 144 IRQ_TYPE_EDGE_RISING>;
+ interrupt-controller;
+ #interrupt-cells = <2>;
+ };
+ };
+
qcom,smdpkt {
compatible = "qcom,smdpkt";
@@ -1859,7 +1899,8 @@
"wlan_tx_status", "alarms_txctl",
"alarms_tactl", "pronto_mcu_base";
- interrupts = <0 145 0 0 146 0>;
+ interrupts = <0 145 IRQ_TYPE_EDGE_RISING>,
+ <0 146 IRQ_TYPE_EDGE_RISING>;
interrupt-names = "wcnss_wlantx_irq", "wcnss_wlanrx_irq";
qcom,pronto-vddmx-supply = <&pm8937_l3_level_ao>;
@@ -1906,6 +1947,9 @@
clock-names = "xo", "rf_clk";
+ qcom,smem-states = <&apps_smsm 10>, <&apps_smsm 9>, <&apps_smsm 12>;
+ qcom,smem-state-names = "tx-enable", "tx-rings-empty", "wake-state";
+
qcom,has-autodetect-xo;
qcom,is-pronto-v3;
qcom,has-pronto-hw;
diff --git a/qcom/msm8937.dtsi b/qcom/msm8937.dtsi
index 376ba8b3..6658aad5 100644
--- a/qcom/msm8937.dtsi
+++ b/qcom/msm8937.dtsi
@@ -299,7 +299,7 @@
cpu-pmu {
compatible = "arm,armv8-pmuv3";
- interrupts = <1 7 0xff00>;
+ interrupts = <1 7 IRQ_TYPE_LEVEL_HIGH>;
};
qcom,sps {
@@ -1152,7 +1152,7 @@
<0x200a000 0x2100>;
reg-names = "core", "chnls", "obsrvr", "intr", "cnfg";
interrupt-names = "periph_irq";
- interrupts = <GIC_SPI 190 IRQ_TYPE_NONE>;
+ interrupts = <GIC_SPI 190 IRQ_TYPE_LEVEL_HIGH>;
qcom,ee = <0>;
qcom,channel = <0>;
#address-cells = <1>;
@@ -1543,6 +1543,42 @@
};
};
+ qcom,smsm {
+ compatible = "qcom,smsm";
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ qcom,ipc-1 = <&apcs 0 13>;
+ qcom,ipc-2 = <&apcs 0 9>;
+ qcom,ipc-3 = <&apcs 0 19>;
+
+ apps_smsm: apps@0 {
+ reg = <0>;
+ #qcom,smem-state-cells = <1>;
+ };
+
+ modem_smsm: modem@1 {
+ reg = <1>;
+ interrupts = <0 26 IRQ_TYPE_EDGE_RISING>;
+ interrupt-controller;
+ #interrupt-cells = <2>;
+ };
+
+ adsp_smsm: adsp@2 {
+ reg = <2>;
+ interrupts = <0 290 IRQ_TYPE_EDGE_RISING>;
+ interrupt-controller;
+ #interrupt-cells = <2>;
+ };
+
+ wcnss_smsm: wcnss@3 {
+ reg = <3>;
+ interrupts = <0 144 IRQ_TYPE_EDGE_RISING>;
+ interrupt-controller;
+ #interrupt-cells = <2>;
+ };
+ };
+
qcom,smdpkt {
compatible = "qcom,smdpkt";
@@ -2091,7 +2127,8 @@
"wlan_tx_status", "alarms_txctl",
"alarms_tactl", "pronto_mcu_base";
- interrupts = <0 145 0 0 146 0>;
+ interrupts = <0 145 IRQ_TYPE_EDGE_RISING>,
+ <0 146 IRQ_TYPE_EDGE_RISING>;
interrupt-names = "wcnss_wlantx_irq", "wcnss_wlanrx_irq";
qcom,pronto-vddmx-supply = <&pm8937_l3_level_ao>;
diff --git a/qcom/qm215-camera.dtsi b/qcom/qm215-camera.dtsi
index aad0017e..e19f5213 100644
--- a/qcom/qm215-camera.dtsi
+++ b/qcom/qm215-camera.dtsi
@@ -15,7 +15,7 @@
reg = <0x1b34000 0x1000>,
<0x1b00030 0x4>;
reg-names = "csiphy", "csiphy_clk_mux";
- interrupts = <0 78 0>;
+ interrupts = <0 78 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "csiphy";
clocks = <&gcc GCC_CAMSS_TOP_AHB_CLK>,
<&gcc GCC_CAMSS_ISPIF_AHB_CLK>,
@@ -38,7 +38,7 @@
reg = <0x1b35000 0x1000>,
<0x1b00038 0x4>;
reg-names = "csiphy", "csiphy_clk_mux";
- interrupts = <0 79 0>;
+ interrupts = <0 79 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "csiphy";
clocks = <&gcc GCC_CAMSS_TOP_AHB_CLK>,
<&gcc GCC_CAMSS_ISPIF_AHB_CLK>,
@@ -60,7 +60,7 @@
compatible = "qcom,csid-v3.4.3", "qcom,csid";
reg = <0x1b30000 0x400>;
reg-names = "csid";
- interrupts = <0 51 0>;
+ interrupts = <0 51 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "csid";
qcom,csi-vdd-voltage = <1088000>;
qcom,mipi-csi-vdd-supply = <&pm8916_l2>;
@@ -300,6 +300,7 @@
qcom,cam_smmu {
status = "ok";
compatible = "qcom,msm-cam-smmu";
+ qcom,iommu-dma-addr-pool = <0x00020000 0x7FFE0000>;
msm_cam_smmu_cb1: msm_cam_smmu_cb1 {
compatible = "qcom,msm-cam-smmu-cb";
iommus = <&apps_iommu 0x400 0x00>,
@@ -308,12 +309,6 @@
qcom,scratch-buf-support;
};
- msm_cam_smmu_cb2: msm_cam_smmu_cb2 {
- compatible = "qcom,msm-cam-smmu-cb";
- label = "vfe_secure";
- qcom,secure-context;
- };
-
msm_cam_smmu_cb3: msm_cam_smmu_cb3 {
compatible = "qcom,msm-cam-smmu-cb";
iommus = <&apps_iommu 0x1c00 0x00>;
@@ -382,7 +377,7 @@
"camss_top_ahb_clk", "camss_vfe_cpp_ahb_clk",
"camss_vfe_cpp_axi_clk", "camss_vfe_cpp_clk",
"micro_iface_clk", "camss_ahb_clk";
- qcom,clock-rates = <61540000 180000000 0 0 0 180000000 0 0>;
+ qcom,src-clock-rates = <61540000 180000000 0 0 0 180000000 0 0>;
qcom,min-clock-rate = <133000000>;
resets = <&gcc GCC_CAMSS_MICRO_BCR>;
reset-names = "micro_iface_reset";
diff --git a/qcom/qm215-pm8916.dtsi b/qcom/qm215-pm8916.dtsi
index fa08b0f8..063224b2 100644
--- a/qcom/qm215-pm8916.dtsi
+++ b/qcom/qm215-pm8916.dtsi
@@ -36,10 +36,6 @@
};
};
- qcom,cpu-clock-8939@b111050 {
- /delete-property/ vdd-c1-supply;
- };
-
qcom,gcc@1800000 {
/delete-property/ vdd_cx-supply;
/delete-property/ vdd_hf_dig-supply;
@@ -194,10 +190,6 @@
};
};
-&clock_cpu {
- vdd-c1-supply = <&apc_vreg_corner>;
-};
-
&gcc {
vdd_cx-supply = <&pm8916_s1_level>;
vdd_hf_dig-supply = <&pm8916_s1_level_ao>;
diff --git a/qcom/sdm660-mdss.dtsi b/qcom/sdm660-mdss.dtsi
index 931619fd..0389edca 100644
--- a/qcom/sdm660-mdss.dtsi
+++ b/qcom/sdm660-mdss.dtsi
@@ -10,6 +10,9 @@
interrupts = <0 83 IRQ_TYPE_LEVEL_HIGH>;
interrupt-controller;
#interrupt-cells = <1>;
+
+ #list-cells = <1>;
+
vdd-supply = <&gdsc_mdss>;
/* Bus Scale Settings */
@@ -580,6 +583,8 @@
reg-names = "mdp_phys",
"rot_vbif_phys";
+ #list-cells = <1>;
+
qcom,mdss-rot-mode = <1>;
qcom,mdss-highest-bank-bit = <0x1>;
@@ -607,6 +612,7 @@
interrupt-parent = <&mdss_mdp>;
interrupts = <2 0>;
+ qcom,mdss-rot-parent = <&mdss_mdp 0>;
/* VBIF QoS remapper settings*/
qcom,mdss-rot-vbif-qos-setting = <1 1 1 1>;
qcom,mdss-rot-xin-id = <14 15>;
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 13:21:56 +0000