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

Commit bc144289 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add cnss device nodes for sa6155"

parents 8228542c dd75aef9

arch/arm64/boot/dts/qcom/sa6155-pcie.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -178,6 +178,9 @@ 
						RPMH_REGULATOR_LEVEL_NOM 0>;



		qcom,no-l0s-supported;

		qcom,no-l1-supported;

		qcom,no-l1ss-supported;

		qcom,no-aux-clk-sync;



		qcom,max-link-speed = <0x2>;

arch/arm64/boot/dts/qcom/sa6155-regulator.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -519,5 +519,10 @@ 
		enable-active-high;

		gpio = <&pm6155_1_gpios 6 0>;

	};



	vreg_wlan: vreg_wlan {

		compatible = "qcom,stub-regulator";

		regulator-name = "vreg_wlan";

	};

};

arch/arm64/boot/dts/qcom/sa6155.dtsi

+33 −0
Original line number Diff line number Diff line
@@ -270,3 +270,36 @@ 
};



#include "sa6155-pcie.dtsi"



&soc {

	cnss_pcie: qcom,cnss {

		compatible = "qcom,cnss";

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

		vdd-wlan-supply = <&vreg_wlan>;

		vdd-wlan-io-supply = <&pm6155_1_s4>;

		vdd-wlan-ctrl1-supply = <&vreg_conn_pa>;

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

		reg = <0x10000000 0x10000000>,

			<0x20000000 0x10000>;

		reg-names = "smmu_iova_base", "smmu_iova_ipa";

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

		qcom,smmu-s1-enable;

	};

};

arch/arm64/boot/dts/qcom/sa6155p.dtsi

+31 −0
Original line number Diff line number Diff line
@@ -23,6 +23,37 @@ 
	aliases {

		pci-domain0 = &pcie0; /* PCIe0 domain */

	};



	cnss_pcie: qcom,cnss {

		compatible = "qcom,cnss";

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

		vdd-wlan-supply = <&vreg_wlan>;

		vdd-wlan-io-supply = <&pm6155_1_s4>;

		vdd-wlan-ctrl1-supply = <&vreg_conn_pa>;

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

		reg = <0x10000000 0x10000000>,

			<0x20000000 0x10000>;

		reg-names = "smmu_iova_base", "smmu_iova_ipa";

		qcom,smmu-s1-enable;

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

	};

};



/* Delete second instance of pm6155 definitions for APQ version */

arch/arm64/boot/dts/qcom/sm6150-pinctrl.dtsi

+29 −0
Original line number Diff line number Diff line
@@ -899,6 +899,35 @@ 
			};

		};



		cnss_pins {

			cnss_wlan_en_active: cnss_wlan_en_active {

				mux {

					pins = "gpio98";

					function = "gpio";

				};



				config {

					pins = "gpio98";

					drive-strength = <16>;

					output-high;

					bias-pull-up;

				};

			};

			cnss_wlan_en_sleep: cnss_wlan_en_sleep {

				mux {

					pins = "gpio98";

					function = "gpio";

				};



				config {

					pins = "gpio98";

					drive-strength = <2>;

					output-low;

					bias-pull-down;

				};

			};

		};



		wsa_swr_clk_pin {

			wsa_swr_clk_sleep: wsa_swr_clk_sleep {

				mux {