From a92910f592d782448526151f2c11fed94c55702c Mon Sep 17 00:00:00 2001 From: Saurabh Ambulkar Date: Fri, 17 Jul 2020 07:40:56 +0530 Subject: [PATCH 1/3] ARM: dts: msm: Add device node for IMEM on SM8150 Add IMEM device tree node on sm8150 target. Change-Id: I3fac756393c9d5152a52b3f42bcf35163584d7e9 --- qcom/sm8150.dtsi | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/qcom/sm8150.dtsi b/qcom/sm8150.dtsi index b267c74748e4..0a34f1cc28ac 100644 --- a/qcom/sm8150.dtsi +++ b/qcom/sm8150.dtsi @@ -678,6 +678,49 @@ }; }; + qcom,msm-imem@146bf000 { + compatible = "qcom,msm-imem"; + reg = <0x146bf000 0x1000>; + ranges = <0x0 0x146bf000 0x1000>; + #address-cells = <1>; + #size-cells = <1>; + + mem_dump_table@10 { + compatible = "qcom,msm-imem-mem_dump_table"; + reg = <0x10 0x8>; + }; + + restart_reason@65c { + compatible = "qcom,msm-imem-restart_reason"; + reg = <0x65c 0x4>; + }; + + dload_type@1c { + compatible = "qcom,msm-imem-dload-type"; + reg = <0x1c 0x4>; + }; + + boot_stats@6b0 { + compatible = "qcom,msm-imem-boot_stats"; + reg = <0x6b0 0x20>; + }; + + kaslr_offset@6d0 { + compatible = "qcom,msm-imem-kaslr_offset"; + reg = <0x6d0 0xc>; + }; + + pil@94c { + compatible = "qcom,msm-imem-pil"; + reg = <0x94c 0xc8>; + }; + + diag_dload@c8 { + compatible = "qcom,msm-imem-diag-dload"; + reg = <0xc8 0xc8>; + }; + }; + qcom,msm-rtb { compatible = "qcom,msm-rtb"; qcom,rtb-size = <0x100000>; From f2e2f9d4ea8714bd903f19d7398395492f47a9f3 Mon Sep 17 00:00:00 2001 From: Saurabh Ambulkar Date: Thu, 16 Jul 2020 10:43:22 +0530 Subject: [PATCH 2/3] ARM: dts: msm: Add modem device node for PIL SM8150 Add PIL device tree node to load firmware images of modem on SM8150. Change-Id: I2e6c2c0c5e20c948213bd9fa7873d86ac13bb140 --- qcom/sa8155-adp-common.dtsi | 4 +++ qcom/sa8155.dtsi | 5 ++++ qcom/sm8150.dtsi | 49 +++++++++++++++++++++++++++++++++++++ 3 files changed, 58 insertions(+) diff --git a/qcom/sa8155-adp-common.dtsi b/qcom/sa8155-adp-common.dtsi index 431edd4ef15f..fefcd3bad4be 100644 --- a/qcom/sa8155-adp-common.dtsi +++ b/qcom/sa8155-adp-common.dtsi @@ -57,3 +57,7 @@ &qupv3_se12_2uart { status = "ok"; }; + +&pil_modem { + status = "disabled"; +}; diff --git a/qcom/sa8155.dtsi b/qcom/sa8155.dtsi index bfc7cfe41273..0df8a5221cd3 100644 --- a/qcom/sa8155.dtsi +++ b/qcom/sa8155.dtsi @@ -101,6 +101,11 @@ parent-supply = <&VDD_GFX_LEVEL>; }; + +&pil_modem { + vdd_mss-supply = <&pm8150_1_s8_level>; +}; + &ufsphy_mem { vdda-phy-supply = <&pm8150_2_l18>; }; diff --git a/qcom/sm8150.dtsi b/qcom/sm8150.dtsi index 0a34f1cc28ac..e6ce2a1ce7b9 100644 --- a/qcom/sm8150.dtsi +++ b/qcom/sm8150.dtsi @@ -1678,6 +1678,55 @@ vote = <44>; }; }; + + pil_modem: qcom,mss@4080000 { + compatible = "qcom,pil-tz-generic"; + reg = <0x4080000 0x100>; + + clocks = <&rpmhcc RPMH_CXO_CLK>; + clock-names = "xo"; + qcom,proxy-clock-names = "xo"; + + vdd_cx-supply = <&VDD_CX_LEVEL>; + qcom,vdd_cx-uV-uA = ; + vdd_mss-supply = <&pm8150_s1_level>; + qcom,vdd_mss-uV-uA = ; + qcom,proxy-reg-names = "vdd_cx", "vdd_mss"; + + qcom,firmware-name = "modem"; + memory-region = <&pil_modem_mem>; + qcom,proxy-timeout-ms = <10000>; + qcom,sysmon-id = <0>; + qcom,minidump-id = <3>; + qcom,aux-minidump-ids = <4>; + qcom,ssctl-instance-id = <0x12>; + qcom,pas-id = <4>; + qcom,smem-id = <421>; + qcom,signal-aop; + qcom,complete-ramdump; + + /* Inputs from mss */ + interrupts-extended = <&pdc 0 266 1>, + <&modem_smp2p_in 0 0>, + <&modem_smp2p_in 2 0>, + <&modem_smp2p_in 1 0>, + <&modem_smp2p_in 3 0>, + <&modem_smp2p_in 7 0>; + + interrupt-names = "qcom,wdog", + "qcom,err-fatal", + "qcom,proxy-unvote", + "qcom,err-ready", + "qcom,stop-ack", + "qcom,shutdown-ack"; + + /* Outputs to mss */ + qcom,smem-states = <&modem_smp2p_out 0>; + qcom,smem-state-names = "qcom,force-stop"; + + mboxes = <&qmp_aop 0>; + mbox-names = "mss-pil"; + }; }; &firmware { From f3b1e79deb4866d560a68b0431b5f62fdd24ea75 Mon Sep 17 00:00:00 2001 From: Saurabh Ambulkar Date: Thu, 16 Jul 2020 14:41:14 +0530 Subject: [PATCH 3/3] ARM: dts: msm: Add slpi device node for PIL on SM8150 Add PIL device tree node to load firmware images of slpi on sm8150. Change-Id: I890b05c40aea755c1c631a3b1e7556bfca155f80 --- qcom/sa8155.dtsi | 4 ++++ qcom/sm8150.dtsi | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/qcom/sa8155.dtsi b/qcom/sa8155.dtsi index 0df8a5221cd3..ff361ab4427e 100644 --- a/qcom/sa8155.dtsi +++ b/qcom/sa8155.dtsi @@ -101,6 +101,10 @@ parent-supply = <&VDD_GFX_LEVEL>; }; +&pil_ssc { + vdd_cx-supply = <&VDD_CX_LEVEL>; + vdd_mx-supply = <&VDD_MX_LEVEL>; +}; &pil_modem { vdd_mss-supply = <&pm8150_1_s8_level>; diff --git a/qcom/sm8150.dtsi b/qcom/sm8150.dtsi index e6ce2a1ce7b9..2846681eda10 100644 --- a/qcom/sm8150.dtsi +++ b/qcom/sm8150.dtsi @@ -1727,6 +1727,54 @@ mboxes = <&qmp_aop 0>; mbox-names = "mss-pil"; }; + + pil_ssc: qcom,ssc@5c00000 { + compatible = "qcom,pil-tz-generic"; + reg = <0x5c00000 0x4000>; + + vdd_cx-supply = <&pm8150_l8_level>; + qcom,vdd_cx-uV-uA = ; + vdd_mx-supply = <&pm8150_l4_level>; + qcom,vdd_mx-uV-uA = ; + + qcom,proxy-reg-names = "vdd_cx", "vdd_mx"; + qcom,keep-proxy-regs-on; + + clocks = <&rpmhcc RPMH_CXO_CLK>; + clock-names = "xo"; + qcom,proxy-clock-names = "xo"; + + qcom,pas-id = <12>; + qcom,proxy-timeout-ms = <10000>; + qcom,smem-id = <424>; + qcom,sysmon-id = <3>; + qcom,ssctl-instance-id = <0x16>; + qcom,firmware-name = "slpi"; + status = "ok"; + memory-region = <&pil_slpi_mem>; + qcom,signal-aop; + qcom,complete-ramdump; + + /* Inputs from ssc */ + interrupts-extended = <&pdc 0 494 1>, + <&dsps_smp2p_in 0 0>, + <&dsps_smp2p_in 2 0>, + <&dsps_smp2p_in 1 0>, + <&dsps_smp2p_in 3 0>; + + interrupt-names = "qcom,wdog", + "qcom,err-fatal", + "qcom,proxy-unvote", + "qcom,err-ready", + "qcom,stop-ack"; + + /* Outputs to ssc */ + qcom,smem-states = <&dsps_smp2p_out 0>; + qcom,smem-state-names = "qcom,force-stop"; + + mboxes = <&qmp_aop 0>; + mbox-names = "slpi-pil"; + }; }; &firmware {