Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e00d5a7a authored by Kuichu Ni's avatar Kuichu Ni
Browse files

ARM: dts: qcom: Fix three issues in WLAN converged node 

1. Rename vdd-wlan-aon-supply to vdd-wlan-vl-supply to avoid be deleted
   by other platform. Change rfa1/rfa2/rfa3 to vm/sXX/vh as well for
   sa81x5, sa6155 and lxc-vm platform. This issue was introducted from
   commit e9d3bea3, and the regulator of "vdd-wlan-aon" will be
   revmoved from vreg_list in cnss_disable_redundant_vreg().

2. Set unvote flag to 0 to keep fixed voltage for AUTO platform. This
   issue was introduced from the commit 65413acfe6, and some LDOs
   were unvoted after receiving FW ready. This is unexpected behavior
   for the AUTO platform, so that set the need_unvote to 0.

3. Add "address-cells" and "size-cells" property in pcie_rc0 for sa81x5
   and sa6155 platform.

Change-Id: I365c773a48ac436ac4d09518c242fdd587b64064
parent 3019aaa8

qcom/sa6155-cnss.dtsi

+8 −6
Original line number Diff line number Diff line
@@ -87,9 +87,9 @@ 
			supported-ids = <0x1101>;

			wlan_vregs = "vdd-wlan-rfa1", "vdd-wlan-rfa2",

				   "vdd-wlan-rfa3";

			qcom,vdd-wlan-rfa1-config = <1350000 1350000 0 0 1>;

			qcom,vdd-wlan-rfa2-config = <2040000 2040000 0 0 1>;

			qcom,vdd-wlan-rfa3-config = <1904000 1904000 0 0 1>;

			qcom,vdd-wlan-rfa1-config = <1350000 1350000 0 0 0>;

			qcom,vdd-wlan-rfa2-config = <2040000 2040000 0 0 0>;

			qcom,vdd-wlan-rfa3-config = <1904000 1904000 0 0 0>;



			qcom,wlan-ramdump-dynamic = <0x400000>;

			mhi,max-channels = <30>;
@@ -195,9 +195,9 @@ 
			supported-ids = <0x1102>;

			wlan_vregs = "vdd-wlan-rfa1", "vdd-wlan-rfa2",

				   "vdd-wlan-rfa3";

			qcom,vdd-wlan-rfa1-config = <1350000 1350000 0 0 1>;

			qcom,vdd-wlan-rfa2-config = <2040000 2040000 0 0 1>;

			qcom,vdd-wlan-rfa3-config = <1904000 1904000 0 0 1>;

			qcom,vdd-wlan-rfa1-config = <1350000 1350000 0 0 0>;

			qcom,vdd-wlan-rfa2-config = <2040000 2040000 0 0 0>;

			qcom,vdd-wlan-rfa3-config = <1904000 1904000 0 0 0>;



			qcom,wlan-ramdump-dynamic = <0x400000>;

			mhi,max-channels = <30>;
@@ -307,6 +307,8 @@ 
};



&pcie_rc0 {

	#address-cells = <5>;

	#size-cells = <0>;

	cnss_pci: cnss_pci {

		reg = <0 0 0 0 0>;

		qcom,iommu-group = <&cnss_pci_iommu_group>;

qcom/sa8155-cnss.dtsi

+18 −17
Original line number Diff line number Diff line
@@ -65,10 +65,10 @@ 
		vdd-wlan-ctrl1-supply = <&vreg_conn_pa>;

		vdd-wlan-ctrl2-supply = <&vreg_conn_1p8>;

		vdd-wlan-supply = <&vreg_wlan>;

		vdd-wlan-aon-supply = <&pm8150_1_s6>;

		vdd-wlan-rfa1-supply = <&pm8150_2_s4>;

		vdd-wlan-rfa2-supply = <&pm8150_2_s5>;

		vdd-wlan-rfa3-supply = <&pm8150_2_l15>;

		vdd-wlan-vl-supply = <&pm8150_1_s6>;

		vdd-wlan-vm-supply = <&pm8150_2_s4>;

		vdd-wlan-s5c-supply = <&pm8150_2_s5>;

		vdd-wlan-vh-supply = <&pm8150_2_l15>;



		wlan_vregs = "vdd-wlan-ctrl1", "vdd-wlan-ctrl2";

		qcom,vdd-wlan-ctrl1-config = <0 0 0 0 0>;
@@ -94,13 +94,12 @@ 
			reg-names = "smmu_iova_ipa";



			supported-ids = <0x1101>;

			wlan_vregs = "vdd-wlan-aon", "vdd-wlan-rfa1",

				   "vdd-wlan-rfa2", "vdd-wlan-rfa3";

			qcom,vdd-wlan-aon-config = <1055000 1055000 0 0 1>;

			qcom,vdd-wlan-rfa1-config = <1370000 1370000 0 0 1>;

			qcom,vdd-wlan-rfa2-config = <2040000 2040000 0 0 1>;

			qcom,vdd-wlan-rfa3-config = <1900000 1900000 450000 0 1>;



			wlan_vregs = "vdd-wlan-vl", "vdd-wlan-vm",

				   "vdd-wlan-s5c", "vdd-wlan-vh";

			qcom,vdd-wlan-vl-config = <1055000 1055000 0 0 0>;

			qcom,vdd-wlan-vm-config = <1370000 1370000 0 0 0>;

			qcom,vdd-wlan-s5c-config = <2040000 2040000 0 0 0>;

			qcom,vdd-wlan-vh-config = <1900000 1900000 450000 0 0>;

			qcom,wlan-ramdump-dynamic = <0x400000>;

			mhi,max-channels = <30>;

			mhi,timeout = <10000>;
@@ -205,12 +204,12 @@ 
			reg-names = "smmu_iova_ipa";



			supported-ids = <0x1102>;

			wlan_vregs = "vdd-wlan-aon", "vdd-wlan-rfa1",

				   "vdd-wlan-rfa2", "vdd-wlan-rfa3";

			qcom,vdd-wlan-aon-config = <1055000 1055000 0 0 1>;

			qcom,vdd-wlan-rfa1-config = <1370000 1370000 0 0 1>;

			qcom,vdd-wlan-rfa2-config = <2040000 2040000 0 0 1>;

			qcom,vdd-wlan-rfa3-config = <1900000 1900000 450000 0 1>;

			wlan_vregs = "vdd-wlan-vl", "vdd-wlan-vm",

				   "vdd-wlan-s5c", "vdd-wlan-vh";

			qcom,vdd-wlan-vl-config = <1055000 1055000 0 0 0>;

			qcom,vdd-wlan-vm-config = <1370000 1370000 0 0 0>;

			qcom,vdd-wlan-s5c-config = <2040000 2040000 0 0 0>;

			qcom,vdd-wlan-vh-config = <1900000 1900000 450000 0 0>;



			qcom,wlan-ramdump-dynamic = <0x400000>;

			mhi,max-channels = <30>;
@@ -321,6 +320,8 @@ 
};



&pcie_rc0 {

	#address-cells = <5>;

	#size-cells = <0>;

	cnss_pci: cnss_pci {

		reg = <0 0 0 0 0>;

		qcom,iommu-group = <&cnss_pci_iommu_group>;

qcom/sa8195-vm-lv-cnss-lxc.dtsi

+38 −38
Original line number Diff line number Diff line
@@ -50,14 +50,14 @@ 
		vdd-wlan-ctrl1-supply = <&vreg_conn_pa>;

		vdd-wlan-ctrl2-supply = <&vreg_conn_1p8>;

		vdd-wlan-supply = <&vreg_wlan>;

		vdd-wlan-aon-supply = <&pm8195_1_s5>;

		vdd-wlan-rfa1-supply = <&pm8195_1_s2>;

		vdd-wlan-rfa2-supply = <&pm8195_2_s5>;

		vdd-wlan-rfa3-supply = <&pm8195_2_l7>;

		vdd-wlan-vl-supply = <&pm8195_1_s5>;

		vdd-wlan-vm-supply = <&pm8195_1_s2>;

		vdd-wlan-s5c-supply = <&pm8195_2_s5>;

		vdd-wlan-vh-supply = <&pm8195_2_l7>;



		wlan_vregs = "vdd-wlan-ctrl1", "vdd-wlan-ctrl2";

		qcom,vdd-wlan-ctrl1-config = <0 0 0 0>;

		qcom,vdd-wlan-ctrl2-config = <0 0 0 0>;

		qcom,vdd-wlan-ctrl1-config = <0 0 0 0 0>;

		qcom,vdd-wlan-ctrl2-config = <0 0 0 0 0>;

		wlan-en-gpio = <&tlmm 169 0>;

		pinctrl-names = "wlan_en_active", "wlan_en_sleep";

		pinctrl-0 = <&cnss_wlan_en_active>;
@@ -70,7 +70,7 @@ 


			supported-ids = <0x003e>;

			wlan_vregs = "vdd-wlan";

			qcom,vdd-wlan-info = <0 0 0 10>;

			qcom,vdd-wlan-config = <0 0 0 10 1>;



			qcom,wlan-ramdump-dynamic = <0x200000>;

		};
@@ -80,12 +80,12 @@ 
			reg-names = "smmu_iova_ipa";



			supported-ids = <0x1101>;

			wlan_vregs = "vdd-wlan-aon", "vdd-wlan-rfa1",

				   "vdd-wlan-rfa2", "vdd-wlan-rfa3";

			qcom,vdd-wlan-aon-config = <1000000 1000000 0 0 1>;

			qcom,vdd-wlan-rfa1-config = <1370000 1370000 0 0 1>;

			qcom,vdd-wlan-rfa2-config = <2040000 2040000 0 0 1>;

			qcom,vdd-wlan-rfa3-config = <1900000 1900000 450000 0 1>;

			wlan_vregs = "vdd-wlan-vl", "vdd-wlan-vm",

				   "vdd-wlan-s5c", "vdd-wlan-vh";

			qcom,vdd-wlan-vl-config = <1000000 1000000 0 0 0>;

			qcom,vdd-wlan-vm-config = <1370000 1370000 0 0 0>;

			qcom,vdd-wlan-s5c-config = <2040000 2040000 0 0 0>;

			qcom,vdd-wlan-vh-config = <1900000 1900000 450000 0 0>;



			qcom,wlan-ramdump-dynamic = <0x400000>;

			mhi,max-channels = <30>;
@@ -191,12 +191,12 @@ 
			reg-names = "smmu_iova_ipa";



			supported-ids = <0x1102>;

			wlan_vregs = "vdd-wlan-aon", "vdd-wlan-rfa1",

				   "vdd-wlan-rfa2", "vdd-wlan-rfa3";

			qcom,vdd-wlan-aon-config = <1055000 1055000 0 0 1>;

			qcom,vdd-wlan-rfa1-config = <1370000 1370000 0 0 1>;

			qcom,vdd-wlan-rfa2-config = <2040000 2040000 0 0 1>;

			qcom,vdd-wlan-rfa3-config = <1900000 1900000 0 0 1>;

			wlan_vregs = "vdd-wlan-vl", "vdd-wlan-vm",

				   "vdd-wlan-s5c", "vdd-wlan-vh";

			qcom,vdd-wlan-vl-config = <1000000 1000000 0 0 0>;

			qcom,vdd-wlan-vm-config = <1370000 1370000 0 0 0>;

			qcom,vdd-wlan-s5c-config = <2040000 2040000 0 0 0>;

			qcom,vdd-wlan-vh-config = <1900000 1900000 450000 0 0>;



			qcom,wlan-ramdump-dynamic = <0x300000>;

			mhi,max-channels = <30>;
@@ -315,14 +315,14 @@ 
		vdd-wlan-ctrl1-supply = <&vreg_conn_pa>;

		vdd-wlan-ctrl2-supply = <&vreg_conn_1p8>;

		vdd-wlan-supply = <&vreg_wlan>;

		vdd-wlan-aon-supply = <&pm8195_1_s5>;

		vdd-wlan-rfa1-supply = <&pm8195_1_s2>;

		vdd-wlan-rfa2-supply = <&pm8195_2_s5>;

		vdd-wlan-rfa3-supply = <&pm8195_2_l7>;

		vdd-wlan-vl-supply = <&pm8195_1_s5>;

		vdd-wlan-vm-supply = <&pm8195_1_s2>;

		vdd-wlan-s5c-supply = <&pm8195_2_s5>;

		vdd-wlan-vh-supply = <&pm8195_2_l7>;



		wlan_vregs = "vdd-wlan-ctrl1", "vdd-wlan-ctrl2";

		qcom,vdd-wlan-ctrl1-config = <0 0 0 0>;

		qcom,vdd-wlan-ctrl2-config = <0 0 0 0>;

		qcom,vdd-wlan-ctrl1-config = <0 0 0 0 0>;

		qcom,vdd-wlan-ctrl2-config = <0 0 0 0 0>;

		wlan-en-gpio = <&tlmm 170 0>;

		pinctrl-names = "wlan_en_active", "wlan_en_sleep";

		pinctrl-0 = <&cnss_wlan_en_active2>;
@@ -334,7 +334,7 @@ 


			supported-ids = <0x003e>;

			wlan_vregs = "vdd-wlan";

			qcom,vdd-wlan-info = <0 0 0 10>;

			qcom,vdd-wlan-info = <0 0 0 10 1>;



			qcom,wlan-ramdump-dynamic = <0x200000>;

		};
@@ -344,12 +344,12 @@ 
			reg-names = "smmu_iova_ipa";



			supported-ids = <0x1101>;

			wlan_vregs = "vdd-wlan-aon", "vdd-wlan-rfa1",

				   "vdd-wlan-rfa2", "vdd-wlan-rfa3";

			qcom,vdd-wlan-aon-config = <1000000 1000000 0 0 1>;

			qcom,vdd-wlan-rfa1-config = <1370000 1370000 0 0 1>;

			qcom,vdd-wlan-rfa2-config = <2040000 2040000 0 0 1>;

			qcom,vdd-wlan-rfa3-config = <1900000 1900000 450000 0 1>;

			wlan_vregs = "vdd-wlan-vl", "vdd-wlan-vm",

				   "vdd-wlan-s5c", "vdd-wlan-vh";

			qcom,vdd-wlan-vl-config = <1000000 1000000 0 0 0>;

			qcom,vdd-wlan-vm-config = <1370000 1370000 0 0 0>;

			qcom,vdd-wlan-s5c-config = <2040000 2040000 0 0 0>;

			qcom,vdd-wlan-vh-config = <1900000 1900000 450000 0 0>;



			qcom,wlan-ramdump-dynamic = <0x400000>;

			mhi,max-channels = <30>;
@@ -433,12 +433,12 @@ 
			reg-names = "smmu_iova_ipa";



			supported-ids = <0x1102>;

			wlan_vregs = "vdd-wlan-aon", "vdd-wlan-rfa1",

				   "vdd-wlan-rfa2", "vdd-wlan-rfa3";

			qcom,vdd-wlan-aon-config = <1055000 1055000 0 0 1>;

			qcom,vdd-wlan-rfa1-config = <1370000 1370000 0 0 1>;

			qcom,vdd-wlan-rfa2-config = <2040000 2040000 0 0 1>;

			qcom,vdd-wlan-rfa3-config = <1900000 1900000 0 0 1>;

			wlan_vregs = "vdd-wlan-vl", "vdd-wlan-vm",

				   "vdd-wlan-s5c", "vdd-wlan-vh";

			qcom,vdd-wlan-vl-config = <1055000 1055000 0 0 0>;

			qcom,vdd-wlan-vm-config = <1370000 1370000 0 0 0>;

			qcom,vdd-wlan-s5c-config = <2040000 2040000 0 0 0>;

			qcom,vdd-wlan-vh-config = <1900000 1900000 450000 0 0>;



			qcom,wlan-ramdump-dynamic = <0x300000>;

			mhi,max-channels = <30>;

qcom/sa8195p-cnss.dtsi

+18 −16
Original line number Diff line number Diff line
@@ -63,10 +63,10 @@ 
		vdd-wlan-ctrl1-supply = <&vreg_conn_pa>;

		vdd-wlan-ctrl2-supply = <&vreg_conn_1p8>;

		vdd-wlan-supply = <&vreg_wlan>;

		vdd-wlan-aon-supply = <&pm8195_1_s5>;

		vdd-wlan-rfa1-supply = <&pm8195_1_s2>;

		vdd-wlan-rfa2-supply = <&pm8195_2_s5>;

		vdd-wlan-rfa3-supply = <&pm8195_2_l7>;

		vdd-wlan-vl-supply = <&pm8195_1_s5>;

		vdd-wlan-vm-supply = <&pm8195_1_s2>;

		vdd-wlan-s5c-supply = <&pm8195_2_s5>;

		vdd-wlan-vh-supply = <&pm8195_2_l7>;



		wlan_vregs = "vdd-wlan-ctrl1", "vdd-wlan-ctrl2";

		qcom,vdd-wlan-ctrl1-config = <0 0 0 0 0>;
@@ -92,12 +92,12 @@ 
			reg-names = "smmu_iova_ipa";



			supported-ids = <0x1101>;

			wlan_vregs = "vdd-wlan-aon", "vdd-wlan-rfa1",

				   "vdd-wlan-rfa2", "vdd-wlan-rfa3";

			qcom,vdd-wlan-aon-config = <1000000 1000000 0 0 1>;

			qcom,vdd-wlan-rfa1-config = <1370000 1370000 0 0 1>;

			qcom,vdd-wlan-rfa2-config = <2040000 2040000 0 0 1>;

			qcom,vdd-wlan-rfa3-config = <1900000 1900000 450000 0 1>;

			wlan_vregs = "vdd-wlan-vl", "vdd-wlan-vm",

				   "vdd-wlan-s5c", "vdd-wlan-vh";

			qcom,vdd-wlan-vl-config = <1000000 1000000 0 0 0>;

			qcom,vdd-wlan-vm-config = <1370000 1370000 0 0 0>;

			qcom,vdd-wlan-s5c-config = <2040000 2040000 0 0 0>;

			qcom,vdd-wlan-vh-config = <1900000 1900000 450000 0 0>;

			qcom,wlan-ramdump-dynamic = <0x400000>;

			mhi,max-channels = <30>;

			mhi,timeout = <10000>;
@@ -202,12 +202,12 @@ 
			reg-names = "smmu_iova_ipa";



			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 1>;

			qcom,vdd-wlan-rfa1-config = <1370000 1370000 0 0 1>;

			qcom,vdd-wlan-rfa2-config = <2040000 2040000 0 0 1>;

			qcom,vdd-wlan-rfa3-config = <1900000 1900000 450000 0 1>;

			wlan_vregs = "vdd-wlan-vl", "vdd-wlan-vm",

				   "vdd-wlan-s5c", "vdd-wlan-vh";

			qcom,vdd-wlan-vl-config = <1000000 1000000 0 0 0>;

			qcom,vdd-wlan-vm-config = <1370000 1370000 0 0 0>;

			qcom,vdd-wlan-s5c-config = <2040000 2040000 0 0 0>;

			qcom,vdd-wlan-vh-config = <1900000 1900000 450000 0 0>;



			qcom,wlan-ramdump-dynamic = <0x400000>;

			mhi,max-channels = <30>;
@@ -317,6 +317,8 @@ 
};



&pcie_rc0 {

	#address-cells = <5>;

	#size-cells = <0>;

	cnss_pci: cnss_pci {

		reg = <0 0 0 0 0>;

		qcom,iommu-group = <&cnss_pci_iommu_group>;