Merge existing fixes from spi/for-5.10

[linux-2.6-microblaze.git] / arch / arm64 / boot / dts / qcom / msm8916-mtp.dtsi

diff --git a/arch/arm64/boot/dts/qcom/msm8916-mtp.dtsi b/arch/arm64/boot/dts/qcom/msm8916-mtp.dtsi
index 0c6e81f..1bd0504 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-mtp.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-mtp.dtsi
@@ -3,8 +3,7 @@
  * Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.
  */
 
-#include "msm8916.dtsi"
-#include "pm8916.dtsi"
+#include "msm8916-pm8916.dtsi"
 
 / {
        aliases {
@@ -15,13 +14,8 @@
        chosen {
                stdout-path = "serial0";
        };
+};
 
-       soc {
-               serial@78b0000 {
-                       status = "okay";
-                       pinctrl-names = "default", "sleep";
-                       pinctrl-0 = <&blsp1_uart2_default>;
-                       pinctrl-1 = <&blsp1_uart2_sleep>;
-               };
-       };
+&blsp1_uart2 {
+       status = "okay";
 };