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

Commit 847bee98 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add wlan DT for sdxpoorwills"

parents af3a3a1a a09bdec3
Loading
Loading
Loading
Loading
+65 −0
Original line number Diff line number Diff line
@@ -1465,6 +1465,64 @@
				input-enable;
			};
		};

		cnss_pins {
			cnss_wlan_en_active: cnss_wlan_en_active {
				mux {
					pins = "gpio52";
					function = "gpio";
				};

				config {
					pins = "gpio52";
					drive-strength = <16>;
					output-high;
					bias-pull-up;
				};
			};

			cnss_wlan_en_sleep: cnss_wlan_en_sleep {
				mux {
					pins = "gpio52";
					function = "gpio";
				};

				config {
					pins = "gpio52";
					drive-strength = <2>;
					output-low;
					bias-pull-down;
				};
			};

			cnss_sdio_active: cnss_sdio_active {
				mux {
					pins = "gpio31";
					function = "gpio";
				};

				config {
					pins = "gpio31";
					drive-strength = <16>;
					output-high;
					bias-pull-up;
				};
			};

			cnss_sdio_sleep: cnss_sdio_sleep {
				mux {
					pins = "gpio31";
					function = "gpio";
				};

				config {
					pins = "gpio31";
					drive-strength = <2>;
					output-low;
					bias-pull-down;
				};
			};
		};
	};
};

@@ -1475,4 +1533,11 @@
			bias-high-impedance;
		};
	};

	vdd_wlan {
		vdd_wlan_default: vdd_wlan_default {
			pins = "gpio6";
			bias-high-impedance;
		};
	};
};
+8 −0
Original line number Diff line number Diff line
@@ -404,4 +404,12 @@
		gpio = <&tlmm 83 GPIO_ACTIVE_HIGH>;
		enable-active-high;
	};

	vreg_wlan: vreg_wlan {
		compatible = "regulator-fixed";
		regulator-name = "vreg_wlan";
		startup-delay-us = <4000>;
		enable-active-high;
		gpio = <&pmxpoorwills_gpios 6 GPIO_ACTIVE_HIGH>;
	};
};
+40 −0
Original line number Diff line number Diff line
@@ -1014,6 +1014,46 @@
		compatible = "qcom,msm-rtb";
		qcom,rtb-size = <0x100000>;
	};

	cnss_pcie: qcom,cnss {
		compatible = "qcom,cnss";
		wlan-en-gpio = <&tlmm 52 0>;
		vdd-wlan-supply = <&vreg_wlan>;
		vdd-wlan-xtal-supply = <&pmxpoorwills_l6>;
		vdd-wlan-io-supply = <&pmxpoorwills_l6>;
		qcom,notify-modem-status;
		pinctrl-names = "wlan_en_active", "wlan_en_sleep";
		pinctrl-0 = <&cnss_wlan_en_active>;
		pinctrl-1 = <&cnss_wlan_en_sleep>;
		qcom,wlan-rc-num = <0>;
		qcom,wlan-ramdump-dynamic = <0x200000>;

		qcom,msm-bus,name = "msm-cnss";
		qcom,msm-bus,num-cases = <4>;
		qcom,msm-bus,num-paths = <2>;
		qcom,msm-bus,vectors-KBps =
				<45 512 0 0>, <1 512 0 0>,
				/* Upto 200 Mbps */
				<45 512 41421 655360>, <1 512 41421 655360>,
				/* Upto 400 Mbps */
				<45 512 98572 655360>, <1 512 98572 1600000>,
				/* Upto 800 Mbps */
				<45 512 207108 1146880>, <1 512 207108 3124992>;
	};

	cnss_sdio: qcom,cnss_sdio {
		compatible = "qcom,cnss_sdio";
		subsys-name = "AR6320_SDIO";
		vdd-wlan-supply = <&vreg_wlan>;
		vdd-wlan-xtal-supply = <&pmxpoorwills_l5>;
		vdd-wlan-io-supply = <&pmxpoorwills_l6>;
		qcom,wlan-ramdump-dynamic = <0x200000>;
		pinctrl-names = "active", "sleep";
		pinctrl-0 = <&cnss_sdio_active>;
		pinctrl-1 = <&cnss_sdio_sleep>;
		qcom,is-antenna-shared;
		status = "disabled";
	};
};

#include "pmxpoorwills.dtsi"