summaryrefslogtreecommitdiff
path: root/qcom/msm8917.dtsi
diff options
context:
space:
mode:
Diffstat (limited to 'qcom/msm8917.dtsi')
-rw-r--r--qcom/msm8917.dtsi272
1 files changed, 173 insertions, 99 deletions
diff --git a/qcom/msm8917.dtsi b/qcom/msm8917.dtsi
index 5b573ce9..8628a7b3 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/mdss-28nm-pll-clk-legacy.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>
@@ -20,18 +21,6 @@
};
aliases {
- /* smdtty devices */
- smd1 = &smdtty_apps_fm;
- smd2 = &smdtty_apps_riva_bt_acl;
- smd3 = &smdtty_apps_riva_bt_cmd;
- smd4 = &smdtty_mbalbridge;
- smd5 = &smdtty_apps_riva_ant_cmd;
- smd6 = &smdtty_apps_riva_ant_data;
- smd7 = &smdtty_data1;
- smd8 = &smdtty_data4;
- smd11 = &smdtty_data11;
- smd21 = &smdtty_data21;
- smd36 = &smdtty_loopback;
sdhc1 = &sdhc_1; /* SDC1 eMMC slot */
sdhc2 = &sdhc_2; /* SDC2 for SD card */
spi3 = &spi_3;
@@ -444,7 +433,7 @@
cpu-pmu {
compatible = "arm,armv8-pmuv3";
- interrupts = <1 7 0xff00>;
+ interrupts = <1 7 IRQ_TYPE_LEVEL_HIGH>;
};
slim_msm: slim@c140000 {
@@ -561,7 +550,7 @@
};
rpmcc: qcom,rpmcc {
- compatible = "qcom,rpmcc-msm8917";
+ compatible = "qcom,rpmcc-qm215";
#clock-cells = <1>;
};
@@ -578,19 +567,25 @@
#reset-cells = <1>;
};
+ cpu_debug: syscon@0b01101c {
+ compatible = "syscon";
+ reg = <0x0b01101c 0x4>;
+ };
+
debugcc: qcom,cc-debug {
compatible = "qcom,msm8917-debugcc";
reg = <0x1874000 0x4>,
<0xb01101c 0x8>;
reg-names = "cc_base", "meas";
qcom,gcc = <&gcc>;
+ qcom,cpu = <&cpu_debug>;
clocks = <&rpmcc RPM_SMD_XO_CLK_SRC>;
clock-names = "xo_clk_src";
#clock-cells = <1>;
};
gcc_mdss: qcom,gcc-mdss@1800000 {
- compatible = "qcom,gcc-mdss-8917";
+ compatible = "qcom,gcc-mdss-qm215";
reg = <0x1800000 0x80000>;
clocks = <&mdss_dsi0_pll PCLK_SRC_0_CLK>,
<&mdss_dsi0_pll BYTECLK_SRC_0_CLK>;
@@ -598,13 +593,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" ;
@@ -641,14 +639,10 @@
msm_cpufreq: qcom,msm-cpufreq {
compatible = "qcom,msm-cpufreq";
- /* TODO
- * clock-names = "cpu0_clk", "cpu1_clk", "cpu2_clk",
- * "cpu3_clk";
- * clocks = <&clock_cpu clk_a53_bc_clk>,
- * <&clock_cpu clk_a53_bc_clk>,
- * <&clock_cpu clk_a53_bc_clk>,
- * <&clock_cpu clk_a53_bc_clk>;
- */
+ clock-names = "cpu0_clk";
+ clocks = <&apsscc APCS_MUX_C1_CLK>;
+
+ qcom,governor-per-policy;
qcom,cpufreq-table =
< 960000 >,
@@ -863,7 +857,7 @@
cpu_cpu_ddr_bw: qcom,cpu-cpu-ddr-bw {
compatible = "qcom,devbw";
- governor = "cpufreq";
+ governor = "performance";
qcom,src-dst-ports =
<MSM_BUS_MASTER_AMPSS_M0 MSM_BUS_SLAVE_EBI_CH0>;
qcom,active-only;
@@ -881,7 +875,7 @@
cpu0_cpu_ddr_latfloor: qcom,cpu0-cpu-ddr-latfloor {
compatible = "qcom,devbw";
- governor = "cpufreq";
+ governor = "performance";
qcom,src-dst-ports =
<MSM_BUS_MASTER_AMPSS_M0 MSM_BUS_SLAVE_EBI_CH0>;
qcom,active-only;
@@ -950,7 +944,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>;
@@ -1194,6 +1188,26 @@
qcom,net-id = <1>;
qcom,low-latency;
};
+
+ qcom,diag {
+ qcom,smd-channels = "DIAG";
+ };
+
+ qcom,diag_cntl {
+ qcom,smd-channels = "DIAG_CNTL";
+ };
+
+ qcom,diag_cmd {
+ qcom,smd-channels = "DIAG_CMD";
+ };
+
+ qcom,diag_dci {
+ qcom,smd-channels = "DIAG_2";
+ };
+
+ qcom.diag_dci_cmd {
+ qcom,smd-channels = "DIAG_2_CMD";
+ };
};
adsp {
@@ -1202,6 +1216,7 @@
qcom,ipc = <&apcs 0 8>;
qcom,smd-edge = <1>;
qcom,remote-pid = <2>;
+ mbox-names = "adsp_smem";
label = "adsp";
qcom,smd-channels = "IPCRTR";
@@ -1209,6 +1224,18 @@
qcom,net-id = <1>;
qcom,low-latency;
};
+
+ qcom,diag {
+ qcom,smd-channels = "DIAG";
+ };
+
+ qcom,diag_cntl {
+ qcom,smd-channels = "DIAG_CNTL";
+ };
+
+ qcom,apr_tal_rpmsg {
+ qcom,smd-channels = "apr_audio_svc";
+ };
};
wcnss {
@@ -1224,6 +1251,14 @@
qcom,net-id = <1>;
qcom,low-latency;
};
+
+ qcom,diag {
+ qcom,smd-channels = "APPS_RIVA_DATA";
+ };
+
+ qcom,diag_cntl {
+ qcom,smd-channels = "APPS_RIVA_CTRL";
+ };
};
rpm {
@@ -1240,63 +1275,39 @@
};
- qcom,smdtty {
- compatible = "qcom,smdtty";
-
- smdtty_apps_fm: qcom,smdtty-apps-fm {
- qcom,smdtty-remote = "wcnss";
- qcom,smdtty-port-name = "APPS_FM";
- };
-
- smdtty_apps_riva_bt_acl: smdtty-apps-riva-bt-acl {
- qcom,smdtty-remote = "wcnss";
- qcom,smdtty-port-name = "APPS_RIVA_BT_ACL";
- };
-
- smdtty_apps_riva_bt_cmd: qcom,smdtty-apps-riva-bt-cmd {
- qcom,smdtty-remote = "wcnss";
- qcom,smdtty-port-name = "APPS_RIVA_BT_CMD";
- };
-
- smdtty_mbalbridge: qcom,smdtty-mbalbridge {
- qcom,smdtty-remote = "modem";
- qcom,smdtty-port-name = "MBALBRIDGE";
- };
-
- smdtty_apps_riva_ant_cmd: smdtty-apps-riva-ant-cmd {
- qcom,smdtty-remote = "wcnss";
- qcom,smdtty-port-name = "APPS_RIVA_ANT_CMD";
- };
-
- smdtty_apps_riva_ant_data: smdtty-apps-riva-ant-data {
- qcom,smdtty-remote = "wcnss";
- qcom,smdtty-port-name = "APPS_RIVA_ANT_DATA";
- };
+ qcom,smsm {
+ compatible = "qcom,smsm";
+ #address-cells = <1>;
+ #size-cells = <0>;
- smdtty_data1: qcom,smdtty-data1 {
- qcom,smdtty-remote = "modem";
- qcom,smdtty-port-name = "DATA1";
- };
+ qcom,ipc-1 = <&apcs 0 13>;
+ qcom,ipc-2 = <&apcs 0 9>;
+ qcom,ipc-3 = <&apcs 0 19>;
- smdtty_data4: qcom,smdtty-data4 {
- qcom,smdtty-remote = "modem";
- qcom,smdtty-port-name = "DATA4";
+ apps_smsm: apps@0 {
+ reg = <0>;
+ #qcom,smem-state-cells = <1>;
};
- smdtty_data11: qcom,smdtty-data11 {
- qcom,smdtty-remote = "modem";
- qcom,smdtty-port-name = "DATA11";
+ modem_smsm: modem@1 {
+ reg = <1>;
+ interrupts = <0 26 IRQ_TYPE_EDGE_RISING>;
+ interrupt-controller;
+ #interrupt-cells = <2>;
};
- smdtty_data21: qcom,smdtty-data21 {
- qcom,smdtty-remote = "modem";
- qcom,smdtty-port-name = "DATA21";
+ adsp_smsm: adsp@2 {
+ reg = <2>;
+ interrupts = <0 290 IRQ_TYPE_EDGE_RISING>;
+ interrupt-controller;
+ #interrupt-cells = <2>;
};
- smdtty_loopback: smdtty-loopback {
- qcom,smdtty-remote = "modem";
- qcom,smdtty-port-name = "LOOPBACK";
- qcom,smdtty-dev-name = "LOOPBACK_TTY";
+ wcnss_smsm: wcnss@3 {
+ reg = <3>;
+ interrupts = <0 144 IRQ_TYPE_EDGE_RISING>;
+ interrupt-controller;
+ #interrupt-cells = <2>;
};
};
@@ -1304,39 +1315,89 @@
compatible = "qcom,smdpkt";
qcom,smdpkt-data5-cntl {
- qcom,smdpkt-remote = "modem";
- qcom,smdpkt-port-name = "DATA5_CNTL";
+ qcom,smdpkt-edge = "modem";
+ qcom,smdpkt-ch-name = "DATA5_CNTL";
qcom,smdpkt-dev-name = "smdcntl0";
};
qcom,smdpkt-data22 {
- qcom,smdpkt-remote = "modem";
- qcom,smdpkt-port-name = "DATA22";
+ qcom,smdpkt-edge = "modem";
+ qcom,smdpkt-ch-name = "DATA22";
qcom,smdpkt-dev-name = "smd22";
};
qcom,smdpkt-data40-cntl {
- qcom,smdpkt-remote = "modem";
- qcom,smdpkt-port-name = "DATA40_CNTL";
+ qcom,smdpkt-edge = "modem";
+ qcom,smdpkt-ch-name = "DATA40_CNTL";
qcom,smdpkt-dev-name = "smdcntl8";
};
qcom,smdpkt-data2 {
- qcom,smdpkt-remote = "modem";
- qcom,smdpkt-port-name = "DATA2";
+ qcom,smdpkt-edge = "modem";
+ qcom,smdpkt-ch-name = "DATA2";
qcom,smdpkt-dev-name = "at_mdm0";
};
qcom,smdpkt-apr-apps2 {
- qcom,smdpkt-remote = "adsp";
- qcom,smdpkt-port-name = "apr_apps2";
+ qcom,smdpkt-edge = "adsp";
+ qcom,smdpkt-ch-name = "apr_apps2";
qcom,smdpkt-dev-name = "apr_apps2";
};
- qcom,smdpkt-loopback {
- qcom,smdpkt-remote = "modem";
- qcom,smdpkt-port-name = "LOOPBACK";
- qcom,smdpkt-dev-name = "smd_pkt_loopback";
+ qcom,smdpkt-apps-riva-bt-acl {
+ qcom,smdpkt-edge = "wcnss";
+ qcom,smdpkt-ch-name = "APPS_RIVA_BT_ACL";
+ qcom,smdpkt-dev-name = "smd2";
+ qcom,smdpkt-fragmented-read;
+ };
+
+ qcom,smdpkt-apps-riva-bt-cmd {
+ qcom,smdpkt-edge = "wcnss";
+ qcom,smdpkt-ch-name = "APPS_RIVA_BT_CMD";
+ qcom,smdpkt-dev-name = "smd3";
+ qcom,smdpkt-fragmented-read;
+ };
+
+ qcom,smdpkt-mbalbridge {
+ qcom,smdpkt-edge = "modem";
+ qcom,smdpkt-ch-name = "MBALBRIDGE";
+ qcom,smdpkt-dev-name = "smd4";
+ };
+
+ qcom,smdpkt-apps-riva-ant-cmd {
+ qcom,smdpkt-edge = "wcnss";
+ qcom,smdpkt-ch-name = "APPS_RIVA_ANT_CMD";
+ qcom,smdpkt-dev-name = "smd5";
+ };
+
+ qcom,smdpkt-apps-riva-ant-data {
+ qcom,smdpkt-edge = "wcnss";
+ qcom,smdpkt-ch-name = "APPS_RIVA_ANT_DATA";
+ qcom,smdpkt-dev-name = "smd6";
+ };
+
+ qcom,smdpkt-data1 {
+ qcom,smdpkt-edge = "modem";
+ qcom,smdpkt-ch-name = "DATA1";
+ qcom,smdpkt-dev-name = "smd7";
+ };
+
+ qcom,smdpkt-data4 {
+ qcom,smdpkt-edge = "modem";
+ qcom,smdpkt-ch-name = "DATA4";
+ qcom,smdpkt-dev-name = "smd8";
+ };
+
+ qcom,smdpkt-data11 {
+ qcom,smdpkt-edge = "modem";
+ qcom,smdpkt-ch-name = "DATA11";
+ qcom,smdpkt-dev-name = "smd11";
+ };
+
+ qcom,smdpkt-data21 {
+ qcom,smdpkt-edge = "modem";
+ qcom,smdpkt-ch-name = "DATA21";
+ qcom,smdpkt-dev-name = "smd21";
};
};
@@ -1348,11 +1409,20 @@
bam_dmux: qcom,bam_dmux@4044000 {
compatible = "qcom,bam_dmux";
reg = <0x4044000 0x19000>;
- interrupts = <GIC_SPI 162 IRQ_TYPE_EDGE_RISING>;
qcom,rx-ring-size = <32>;
qcom,max-rx-mtu = <4096>;
qcom,fast-shutdown;
qcom,no-cpu-affinity;
+
+ qcom,smem-states = <&apps_smsm 1>, <&apps_smsm 11>;
+ qcom,smem-state-names = "pwrctrl", "pwrctrlack";
+
+ interrupts-extended =
+ <&intc GIC_SPI 162 IRQ_TYPE_EDGE_RISING>,
+ <&modem_smsm 1 IRQ_TYPE_EDGE_BOTH>,
+ <&modem_smsm 11 IRQ_TYPE_EDGE_BOTH>;
+
+ interrupt-names = "dmux", "ctrl", "ack";
};
sdcc1_ice: sdcc1ice@7803000 {
@@ -1539,7 +1609,7 @@
qcom,ssctl-instance-id = <0x12>;
qcom,qdsp6v56-1-8-inrush-current;
qcom,reset-clk;
-
+ qcom,iommu-vmid = <0xF>; /* VMID_MSS_MSA */
/* Inputs from mss */
/* TBD */
interrupts-extended = <&modem_smp2p_in 0 0>,
@@ -1834,7 +1904,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>;
@@ -1881,6 +1952,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;
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 00:40:33 +0000