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

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

Merge "ARM: dts: msm: Enable smp2p interrupts for sm8150"

parents 5f755dcd ff81971d

arch/arm64/boot/dts/qcom/sm8150-smp2p.dtsi

+7 −11
Original line number Diff line number Diff line
@@ -44,6 +44,13 @@ 
			interrupt-controller;

			#interrupt-cells = <2>;

		};



		smp2p_wlan_1_in: qcom,smp2p-wlan-1-in {

			qcom,entry-name = "wlan";

			interrupt-controller;

			#interrupt-cells = <2>;

		};



	};



	qcom,smp2p-adsp@1799000c {
@@ -144,15 +151,4 @@ 
		};

	};



	/* wlan - inbound entry from mss/WLAN PD */

	smp2pgpio_wlan_1_in: qcom,smp2pgpio-wlan-1-in {

		compatible = "qcom,smp2pgpio";

		qcom,entry-name = "wlan";

		qcom,remote-pid = <1>;

		qcom,is-inbound;

		gpio-controller;

		#gpio-cells = <2>;

		interrupt-controller;

		#interrupt-cells = <2>;

	};

};

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

+6 −2
Original line number Diff line number Diff line
@@ -3728,8 +3728,6 @@ 
			     <0 425 0 /* CE11 */ >;

		qcom,wlan-msa-memory = <0x100000>;

		qcom,wlan-msa-fixed-region = <&pil_wlan_fw_mem>;

		qcom,gpio-force-fatal-error = <&smp2pgpio_wlan_1_in 0 0>;

		qcom,gpio-early-crash-ind = <&smp2pgpio_wlan_1_in 1 0>;



		vdd-cx-mx-supply = <&pm8150_l1>;

		vdd-1.8-xo-supply = <&pm8150_l7>;
@@ -3737,6 +3735,12 @@ 
		vdd-3.3-ch0-supply = <&pm8150l_l11>;

		qcom,vdd-cx-mx-config = <752000 752000>;

		qcom,vdd-3.3-ch0-config = <3104000 3312000>;

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

		};

	};



	wil6210: qcom,wil6210 {