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

Commit 2a540036 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: modify the cnss_sdio address in mdm9206"

parents 0e028c40 a085f961

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

+6 −0
Original line number Original line Diff line number Diff line
@@ -29,6 +29,12 @@ 




&cnss_debug_mem {

&cnss_debug_mem {

	status = "disabled";

	status = "disabled";

	reg = <0x82800000 0x200000>;

};



&cnss_sdio {

	status = "disabled";

	reg = <0x82800000 0x200000>;

};

};





&qcom_seecom {

&qcom_seecom {

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -575,7 +575,7 @@ 
		status = "disabled";

		status = "disabled";

	};

	};





	qcom,cnss-sdio {

	cnss_sdio: qcom,cnss-sdio {

		compatible = "qcom,cnss_sdio";

		compatible = "qcom,cnss_sdio";

		reg = <0x87a00000 0x200000>;

		reg = <0x87a00000 0x200000>;

		reg-names = "ramdump";

		reg-names = "ramdump";