Эх сурвалжийг харах

Merge tag 'qcom-fixes-for-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into fixes

Qualcomm Fixes for v4.18-rc1

* Fix coresight graph on msm8916
* Disable uart0 on db820c by default

* tag 'qcom-fixes-for-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
  arm64: dts: msm8916: fix Coresight ETF graph connections
  arm64: dts: apq8096-db820c: disable uart0 by default

Signed-off-by: Olof Johansson <olof@lixom.net>
Olof Johansson 7 жил өмнө
parent
commit
fab9715bb8

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

@@ -75,7 +75,7 @@
 
 
 		serial@75b1000 {
 		serial@75b1000 {
 			label = "LS-UART0";
 			label = "LS-UART0";
-			status = "okay";
+			status = "disabled";
 			pinctrl-names = "default", "sleep";
 			pinctrl-names = "default", "sleep";
 			pinctrl-0 = <&blsp2_uart2_4pins_default>;
 			pinctrl-0 = <&blsp2_uart2_4pins_default>;
 			pinctrl-1 = <&blsp2_uart2_4pins_sleep>;
 			pinctrl-1 = <&blsp2_uart2_4pins_sleep>;

+ 2 - 2
arch/arm64/boot/dts/qcom/msm8916.dtsi

@@ -1191,14 +1191,14 @@
 
 
 				port@0 {
 				port@0 {
 					reg = <0>;
 					reg = <0>;
-					etf_out: endpoint {
+					etf_in: endpoint {
 						slave-mode;
 						slave-mode;
 						remote-endpoint = <&funnel0_out>;
 						remote-endpoint = <&funnel0_out>;
 					};
 					};
 				};
 				};
 				port@1 {
 				port@1 {
 					reg = <0>;
 					reg = <0>;
-					etf_in: endpoint {
+					etf_out: endpoint {
 						remote-endpoint = <&replicator_in>;
 						remote-endpoint = <&replicator_in>;
 					};
 					};
 				};
 				};