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

Commit 4fc2526a 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: Remove qupv3 include from overlay for sdm845"

parents ad07f8a0 a91fb841

arch/arm64/boot/dts/qcom/sdm845-cdp-overlay.dts

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <dt-bindings/interrupt-controller/arm-gic.h>



#include "sdm845-cdp.dtsi"

#include "sdm845-qupv3.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDM845 v1 CDP";

arch/arm64/boot/dts/qcom/sdm845-cdp.dtsi

+0 −8
Original line number Diff line number Diff line
@@ -215,14 +215,6 @@ 
		pinctrl-names = "default";

		pinctrl-0 = <&usb2_vbus_boost_default>;

	};



aliases {

		serial0 = &qupv3_se9_2uart;

		spi0 = &qupv3_se8_spi;

		i2c0 = &qupv3_se10_i2c;

		i2c1 = &qupv3_se3_i2c;

		hsuart0 = &qupv3_se6_4uart;

	};

};



&qupv3_se9_2uart {

arch/arm64/boot/dts/qcom/sdm845-mtp-overlay.dts

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <dt-bindings/interrupt-controller/arm-gic.h>



#include "sdm845-mtp.dtsi"

#include "sdm845-qupv3.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDM845 v1 MTP";

arch/arm64/boot/dts/qcom/sdm845-mtp.dtsi

+0 −10
Original line number Diff line number Diff line
@@ -285,16 +285,6 @@ 
	status = "ok";

};



/ {

aliases {

		serial0 = &qupv3_se9_2uart;

		spi0 = &qupv3_se8_spi;

		i2c0 = &qupv3_se10_i2c;

		i2c1 = &qupv3_se3_i2c;

		hsuart0 = &qupv3_se6_4uart;

	};

};



&qupv3_se9_2uart {

	status = "ok";

};

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

+8 −0
Original line number Diff line number Diff line
@@ -39,6 +39,14 @@ 
		sdhc2 = &sdhc_2; /* SDC2 SD card slot */

	};



	aliases {

		serial0 = &qupv3_se9_2uart;

		spi0 = &qupv3_se8_spi;

		i2c0 = &qupv3_se10_i2c;

		i2c1 = &qupv3_se3_i2c;

		hsuart0 = &qupv3_se6_4uart;

	};



	cpus {

		#address-cells = <2>;

		#size-cells = <0>;