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

Commit c7809dfd 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: Disable the BAM DMUX device node for MSM8940"

parents 69767ba5 4dd03882

arch/arm/boot/dts/qcom/msm8937.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -1591,7 +1591,7 @@ 
		};

	};



	qcom,bam_dmux@4044000 {

	bam_dmux: qcom,bam_dmux@4044000 {

		compatible = "qcom,bam_dmux";

		reg = <0x4044000 0x19000>;

		interrupts = <0 162 1>;

arch/arm/boot/dts/qcom/msm8940.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -52,6 +52,10 @@ 
	compatible = "qcom,gcc-mdss-8940";

};



&bam_dmux {

	status = "disabled";

};



&soc {

	ipa_hw: qcom,ipa@07900000 {

		compatible = "qcom,ipa";