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

Commit 9573ce74 authored by Andy Gross's avatar Andy Gross
Browse files

Merge tag 'qcom-fixes-for-4.18-rc1' into linus 

Qualcomm Fixes for v4.18-rc1

* Fix coresight graph on msm8916
* Disable uart0 on db820c by default
parents ce397d21 6b4154a6

arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ 


		serial@75b1000 {

			label = "LS-UART0";

			status = "okay";

			status = "disabled";

			pinctrl-names = "default", "sleep";

			pinctrl-0 = <&blsp2_uart2_4pins_default>;

			pinctrl-1 = <&blsp2_uart2_4pins_sleep>;

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

+2 −2
Original line number Diff line number Diff line
@@ -1191,14 +1191,14 @@ 


				port@0 {

					reg = <0>;

					etf_out: endpoint {

					etf_in: endpoint {

						slave-mode;

						remote-endpoint = <&funnel0_out>;

					};

				};

				port@1 {

					reg = <0>;

					etf_in: endpoint {

					etf_out: endpoint {

						remote-endpoint = <&replicator_in>;

					};

				};