Commit label r2.0_00020.0 - LA.VENDOR.14.3.0.r1-20200-lanai.QSSI15.0

Kbuild

@@ -11,6 +11,7 @@ ifeq ($(CONFIG_ARCH_KALAMA),y)
 dtbo-y += kalama-cnss.dtbo
 dtbo-y += kalama-aim300-cnss.dtbo
 dtbo-y += kalama-rb5-gen2-cnss.dtbo
+dtbo-y += kalama-iot-vc-cnss.dtbo
 endif
 
 ifeq ($(CONFIG_ARCH_QCS405),y)
@@ -105,7 +106,7 @@ dtbo-y += anorak-hsp-cnss.dtbo
 dtbo-y += anorak-kiwi-cnss.dtbo
 endif
 
-ifeq ($(CONFIG_QTI_QUIN_GVM),y)
+ifeq (y, $(filter y, $(CONFIG_ARCH_QTI_VM) $(CONFIG_QTI_QUIN_GVM)))
 dtbo-y += sa8155p-vm-cnss.dtbo
 dtbo-y += sa8195p-vm-cnss.dtbo
 dtbo-y += sa8255p-vm-cnss.dtbo
@@ -125,6 +126,10 @@ ifeq ($(CONFIG_ARCH_SA525),y)
 dtbo-y += sa525m-cnss.dtbo
 endif
 
+ifeq ($(TARGET_SUPPORT),sa510m)
+dtbo-y += sa510m-cnss.dtbo
+endif
+
 ifeq ($(CONFIG_ARCH_KONA),y)
 dtbo-y += kona-iot-vc-cnss.dtbo
 endif

kalama-iot-vc-cnss.dts

@@ -0,0 +1,11 @@
+/dts-v1/;
+/plugin/;
+
+#include "kalama-iot-vc-cnss.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. KalamaP IoT VC";
+	compatible = "qcom,kalamap-iot", "qcom,kalamap", "qcom-iot";
+	qcom,msm-id = <603 0x20000>;
+	qcom,board-id = <0x10020 1>;
+};

kalama-iot-vc-cnss.dtsi

@@ -0,0 +1,6 @@
+#include "kalama-cnss.dtsi"
+
+&cnss_pci1 {
+	reg = <0x100 0x00 0x00 0x00 0x00>;
+	status="disabled";
+};

monaco-vm-cnss.dts

@@ -6,6 +6,6 @@
 / {
 	model = "Qualcomm Technologies, Inc. Monaco Single LA Virtual Machine";
 	compatible = "qcom,monaco", "qcom,quinvm";
-	qcom,msm-id = <606 0x10000>;
+	qcom,msm-id = <606 0x10000>, <695 0x10000>;
 	qcom,board-id = <0 0x1000001>;
 };

niobe-kiwi-cnss.dts

@@ -5,7 +5,7 @@
 
 / {
 	model = "Qualcomm Technologies, Inc. Niobe SoCs";
-	compatible = "qcom,niobe", "qcom,niobep-qxr", "qcom,niobep", "qcom,qxr";
+	compatible = "qcom,niobe", "qcom,niobep-qxr", "qcom,niobep", "qcom,qxr", "qcom,idp", "qcom,niobe-idp";
 	qcom,msm-id = <629 0x10000>, <652 0x10000>;
-	qcom,board-id = <0x10021 0>, <0x10022 0>, <0x10022 1>, <0x10026 0>, <0x10026 1>;
+	qcom,board-id = <0x10021 0>, <0x10022 0>, <0x10022 1>, <0x10022 2>, <0x10026 0>, <0x10026 1>, <0x20026 0x1>;
 };

pineapple-kiwi-cnss.dts

@@ -7,6 +7,8 @@
 	model = "Qualcomm Technologies, Inc. Pineapple SoCs";
 	compatible = "qcom,pineapple", "qcom,pineapplep";
 	qcom,msm-id = <557 0x10000>, <577 0x10000>, <557 0x20000>, <577 0x20000>,
-			<682 0x10000>, <682 0x20000>, <696 0x10000>, <696 0x20000>;
+			<682 0x10000>, <682 0x20000>, <696 0x10000>, <696 0x20000>,
+			<645 0x10000>, <645 0x20000>, <646 0x10000>, <646 0x20000>,
+			<702 0x10000>, <702 0x20000>;
 	qcom,board-id = <1 0>, <8 0>, <11 0>, <0x15 0>, <0x1000B 0>, <0x10021 0>, <0x50001 0>, <0x50008 0>, <0x5000B 0>;
 };

sa510m-cnss.dts

@@ -0,0 +1,11 @@
+/dts-v1/;
+/plugin/;
+
+#include "sa510m-cnss.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SA510M";
+	compatible = "qcom,sa510m";
+	qcom,msm-id = <697 0x10000>;
+	qcom,board-id = <0x22 0x200>, <0x22 0x300>;
+};

sa510m-cnss.dtsi

@@ -0,0 +1,100 @@
+#include <dt-bindings/interconnect/qcom,sdxbaagha.h>
+#include <dt-bindings/clock/qcom,rpmh.h>
+#include <dt-bindings/iio/qcom,spmi-adc5-gen3-pmx35.h>
+#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
+&tlmm {
+	cnss_pins {
+		wlan_en_active: wlan_en_active {
+			mux {
+				pins = "gpio95";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio95";
+				drive-strength = <16>;
+				output-high;
+				bias-pull-up;
+			};
+		};
+
+		wlan_en_sleep: wlan_en_sleep {
+			mux {
+				pins = "gpio95";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio95";
+				drive-strength = <2>;
+				output-low;
+				bias-pull-down;
+			};
+		};
+	};
+};
+
+&reserved_memory {
+	#address-cells = <1>;
+	#size-cells = <1>;
+	ranges;
+
+	cnss_wlan_mem: cnss_wlan_region {
+		compatible = "shared-dma-pool";
+		alloc-ranges = <0x00000000 0xffffffff>;
+		reusable;
+		alignment = <0x400000>;
+		size = <0x1400000>;
+	};
+};
+
+&soc {
+	wlan: qcom,cnss-qca-converged {
+		compatible = "qcom,cnss-qca-converged";
+		qcom,wlan;
+		qcom,multi-wlan-exchg;
+		qcom,wlan-rc-num = <0>;
+		qcom,bus-type=<0>;
+		qcom,notify-modem-status;
+
+		vdd-wlan-io-supply = <&L6A>;
+		wlan_vregs = "vdd-wlan-io";
+		qcom,vdd-wlan-io-config = <1800000 1800000 0 0 1>;
+		wlan-en-gpio = <&tlmm 95 0>;
+		pinctrl-names = "wlan_en_active", "wlan_en_sleep";
+		pinctrl-0 = <&wlan_en_active &display_bl_en>;
+		pinctrl-1 = <&wlan_en_sleep>;
+
+		chip_cfg@0 {
+			supported-ids = <0x003e>;
+			qcom,wlan-ramdump-dynamic = <0x200000>;
+		};
+	};
+};
+
+&pcie0 {
+	qcom,boot-option = <0x1>;
+	status = "ok";
+};
+
+&pcie0_rp {
+	#address-cells = <5>;
+	#size-cells = <0>;
+	cnss_pci: cnss_pci {
+		reg = <0 0 0 0 0>;
+		qcom,iommu-group = <&cnss_pci_iommu_group>;
+		memory-region = <&cnss_wlan_mem>;
+
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		cnss_pci_iommu_group: cnss_pci_iommu_group {
+			qcom,iommu-dma-addr-pool = <0xa0000000 0x10000000>;
+			qcom,iommu-geometry = <0xa0000000 0x10010000>;
+			qcom,iommu-dma = "atomic";
+			qcom,iommu-faults = "stall-disable", "no-CFRE", "HUPCF",
+					    "non-fatal";
+		};
+	};
+};
+

sa8195p-vm-cnss.dtsi

@@ -62,6 +62,19 @@
 
 			qcom,wlan-ramdump-dynamic = <0x420000>;
 		};
+
+		chip_cfg@2 {
+			supported-ids = <0x1102>;
+
+			wlan_vregs = "vdd-wlan-aon", "vdd-wlan-rfa1",
+				   "vdd-wlan-rfa2", "vdd-wlan-rfa3";
+			qcom,vdd-wlan-aon-config = <1000000 1000000 0 0 0>;
+			qcom,vdd-wlan-rfa1-config = <1370000 1370000 0 0 0>;
+			qcom,vdd-wlan-rfa2-config = <2040000 2040000 0 0 0>;
+			qcom,vdd-wlan-rfa3-config = <1900000 1900000 450000 0 0>;
+
+			qcom,wlan-ramdump-dynamic = <0x400000>;
+		};
 	};
 };
 

sdxkova-cnss.dts

@@ -7,5 +7,5 @@
 	model = "Qualcomm Technologies, Inc. SDXKOVA SoC";
 	compatible = "qcom,sdxkova";
 	qcom,msm-id = <556 0x10000>, <677 0x10000>, <678 0x10000>, <679 0x10000>;
-	qcom,board-id = <0x2010022 0x302>, <0x2010022 0x402>, <0x10022 0x300>, <0x10022 0x400>, <0x20022 0x300>, <0x20022 0x400>, <0x30022 0x300>, <0x30022 0x400>, <0x10015 0x300>, <0x20015 0x300>, <0x30015 0x300>, <0x30015 0x400>;
+	qcom,board-id = <0x2010022 0x302>, <0x2010022 0x402>, <0x10022 0x300>, <0x10022 0x400>, <0x30022 0x300>, <0x30022 0x400>, <0x10015 0x300>, <0x30015 0x300>, <0x30015 0x400>;
 };