From 409f99042be2cfc6358b9f25b34ffb0e1cc7b071 Mon Sep 17 00:00:00 2001 From: Surabhi Vishnoi Date: Thu, 22 Dec 2022 16:21:44 +0530 Subject: [PATCH 1/2] ARM: dts: msm: Disable HSP cnss node in moselle Disable cnss and other HSP related node in moselle. Change-Id: I663a7b2b4068a82ba4019a4c65b622daa02393f9 --- qcom/montague-moselle.dtsi | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/qcom/montague-moselle.dtsi b/qcom/montague-moselle.dtsi index 6d56bfb5..8fd358fc 100644 --- a/qcom/montague-moselle.dtsi +++ b/qcom/montague-moselle.dtsi @@ -1,2 +1,17 @@ #include "montague-hsp.dtsi" +&pcie0 { + status = "disabled"; +}; + +&pcie0_msi { + status = "disabled"; +}; + +&wlan { + status = "disabled"; +}; + +&cnss_wlan_mem { + status = "disabled"; +}; From 00ef5c3a2cfcacb5759911c7c07df53083602c78 Mon Sep 17 00:00:00 2001 From: Surabhi Vishnoi Date: Thu, 22 Dec 2022 16:27:37 +0530 Subject: [PATCH 2/2] ARM: dts: msm: Add icnss node for ravelin wcn6750 Add icnss device node for ravelin moselle attach. Change-Id: Ib537a19219c406e5dff300344f711d5845e76e42 --- qcom/montague-moselle.dtsi | 4 ++ qcom/ravelin-wcn6750.dtsi | 111 +++++++++++++++++++++++++++++++++++++ qcom/ravelin.dtsi | 1 + 3 files changed, 116 insertions(+) create mode 100644 qcom/ravelin-wcn6750.dtsi diff --git a/qcom/montague-moselle.dtsi b/qcom/montague-moselle.dtsi index 8fd358fc..9ddcd225 100644 --- a/qcom/montague-moselle.dtsi +++ b/qcom/montague-moselle.dtsi @@ -1,5 +1,9 @@ #include "montague-hsp.dtsi" +&icnss2 { + status = "ok"; +}; + &pcie0 { status = "disabled"; }; diff --git a/qcom/ravelin-wcn6750.dtsi b/qcom/ravelin-wcn6750.dtsi new file mode 100644 index 00000000..5c9b5ad0 --- /dev/null +++ b/qcom/ravelin-wcn6750.dtsi @@ -0,0 +1,111 @@ +#include + +&soc { + qcom,smp2p-wpss { + smp2p_wlan_2_in: qcom,smp2p-wlan-2-in { + qcom,entry-name = "wlan_soc_wake"; + interrupt-controller; + #interrupt-cells = <2>; + }; + + smp2p_wlan_2_out: qcom,smp2p-wlan-2-out { + qcom,entry-name = "wlan_soc_wake"; + #qcom,smem-state-cells = <1>; + }; + + smp2p_wlan_3_out: qcom,smp2p-wlan-3-out { + qcom,entry-name = "wlan_ep_power_save"; + #qcom,smem-state-cells = <1>; + }; + }; + + wpss_pas: remoteproc-wpss@8a00000 { + firmware-name = "qca6750/wpss.mdt"; + }; + + icnss2: qcom,wcn6750 { + status = "disabled"; + compatible = "qcom,wcn6750"; + reg = <0x17210040 0x0>, + <0xb0000000 0x10000>; + reg-names = "msi_addr", "smmu_iova_ipa"; + qcom,rproc-handle = <&wpss_pas>; + iommus = <&apps_smmu 0x1400 0x1>; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + ; + + qcom,iommu-dma = "fastmap"; + qcom,iommu-faults = "stall-disable", "HUPCF", "non-fatal"; + qcom,iommu-dma-addr-pool = <0xa0000000 0x10000000>; + qcom,iommu-geometry = <0xa0000000 0x10010000>; + dma-coherent; + qcom,fw-prefix; + qcom,wlan; + tsens = "quiet-therm"; + qcom,wlan-msa-fixed-region = <&wlan_msa_mem>; + vdd-cx-mx-supply = <&S7B>; + qcom,vdd-cx-mx-config = <1010000 1120000 0 0 1>; + vdd-1.8-xo-supply = <&S9B>; + qcom,vdd-1.8-xo-config = <1856000 1856000 0 0 0>; + vdd-1.3-rfa-supply = <&S8B>; + qcom,vdd-1.3-rfa-config = <1250000 1352000 0 0 0>; + + qcom,smem-states = <&smp2p_wlan_1_out 0>, + <&smp2p_wlan_2_out 0>, + <&smp2p_wlan_3_out 0>; + qcom,smem-state-names = "wlan-smp2p-out", + "wlan-soc-wake-smp2p-out", + "wlan-ep-powersave-smp2p-out"; + + icnss_cdev_apss: qcom,icnss_cdev1 { + #cooling-cells = <2>; + }; + + icnss_cdev_wpss: qcom,icnss_cdev2 { + #cooling-cells = <2>; + }; + + qcom,smp2p_map_wlan_1_in { + interrupts-extended = <&smp2p_wlan_1_in 0 0>, + <&smp2p_wlan_1_in 1 0>; + interrupt-names = "qcom,smp2p-force-fatal-error", + "qcom,smp2p-early-crash-ind"; + }; + + qcom,smp2p_map_wlan_2_in { + interrupts-extended = <&smp2p_wlan_2_in 0 0>; + interrupt-names = "qcom,smp2p-soc-wake-ack"; + }; + }; +}; + diff --git a/qcom/ravelin.dtsi b/qcom/ravelin.dtsi index 0117b279..df25dfed 100644 --- a/qcom/ravelin.dtsi +++ b/qcom/ravelin.dtsi @@ -2712,6 +2712,7 @@ #include "ravelin-regulators.dtsi" #include "ravelin-pcie.dtsi" #include "ravelin-qcx6490-cnss.dtsi" +#include "ravelin-wcn6750.dtsi" &qupv3_se7_2uart { status = "ok";