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

Commit 2d1c7adf 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: Enable serial devices used by MTP and CDP on SDM855" into msm-4.14

parents a120f1fb 645c17c2

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

+12 −0
Original line number Diff line number Diff line
@@ -38,6 +38,18 @@ 
	};

};



&qupv3_se13_4uart {

	status = "ok";

};



&qupv3_se3_spi {

	status = "ok";

};



&qupv3_se4_i2c {

	status = "ok";

};



&soc {

	gpio_keys {

		compatible = "gpio-keys";

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

+12 −0
Original line number Diff line number Diff line
@@ -38,6 +38,18 @@ 
	};

};



&qupv3_se13_4uart {

	status = "ok";

};



&qupv3_se3_spi {

	status = "ok";

};



&qupv3_se4_i2c {

	status = "ok";

};



&soc {

	gpio_keys {

		compatible = "gpio-keys";

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

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ 
	aliases {

		serial0 = &qupv3_se12_2uart;

		hsuart0 = &qupv3_se13_4uart;

		spi0 = &qupv3_se3_spi;

		i2c0 = &qupv3_se4_i2c;

	};



	cpus {