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

Commit 7db5b4a7 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 88454853 on remote branch 

Change-Id: Ibb181cb75338f144faee47ed583e2222f143ad6d
parents 80162f9b 88454853

arch/arm/boot/dts/qcom/sa415m-cdp.dts

+4 −0
Original line number Diff line number Diff line
@@ -30,3 +30,7 @@ 
&mss_mem {

	reg = <0x86400000 0x9300000>;

};



&smb138x {

	status = "disabled";

};

arch/arm/boot/dts/qcom/sa415m-mtp-256.dts

+4 −0
Original line number Diff line number Diff line
@@ -28,3 +28,7 @@ 
&mss_mem {

	reg = <0x86400000 0x9300000>;

};



&smb138x {

	status = "disabled";

};

arch/arm/boot/dts/qcom/sa415m-ttp.dtsi

+6 −2
Original line number Diff line number Diff line
@@ -53,8 +53,8 @@ 
	};

	cnss_pcie: qcom,cnss {

		compatible = "qcom,cnss";

		reg = <0x10000000 0x10000000>,

		      <0x20000000 0x10000>;

		reg = <0xa0000000 0x10000000>,

		      <0xb0000000 0x10000>;

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



		wlan-en-gpio = <&tlmm 52 0>;
@@ -91,6 +91,10 @@ 
	};

};



&smb138x {

	status = "disabled";

};



&i2c_4 {

	status = "okay";

arch/arm/boot/dts/qcom/sa415m-v2-cdp.dts

+4 −0
Original line number Diff line number Diff line
@@ -31,3 +31,7 @@ 
&mss_mem {

	reg = <0x86400000 0x9300000>;

};



&smb138x {

	status = "disabled";

};

arch/arm/boot/dts/qcom/sa415m-v2-mtp.dts

+4 −0
Original line number Diff line number Diff line
@@ -33,3 +33,7 @@ 
&mss_mem {

	reg = <0x86400000 0x9300000>;

};



&smb138x {

	status = "disabled";

};