[PATCH v2 4/9] serial: msm: Always bind before relocation

[Konrad Dybcio]

In preparation for supporting upstream Linux device trees on Qualcomm
platforms, make this the default behavior.

Signed-off-by: Konrad Dybcio <konrad.dybcio at linaro.org>
---
 arch/arm/dts/dragonboard410c-uboot.dtsi | 4 ----
 arch/arm/dts/dragonboard820c-uboot.dtsi | 4 ----
 arch/arm/dts/qcom-ipq4019.dtsi          | 1 -
 arch/arm/dts/qcs404-evb-uboot.dtsi      | 4 ----
 drivers/serial/serial_msm.c             | 1 +
 5 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/arch/arm/dts/dragonboard410c-uboot.dtsi b/arch/arm/dts/dragonboard410c-uboot.dtsi
index e4fecaa19e64..1d7b31d7e267 100644
--- a/arch/arm/dts/dragonboard410c-uboot.dtsi
+++ b/arch/arm/dts/dragonboard410c-uboot.dtsi
@@ -25,10 +25,6 @@
 		qcom,gcc at 1800000 {
 			u-boot,dm-pre-reloc;
 		};
-
-		serial at 78b0000 {
-			u-boot,dm-pre-reloc;
-		};
 	};
 };
 
diff --git a/arch/arm/dts/dragonboard820c-uboot.dtsi b/arch/arm/dts/dragonboard820c-uboot.dtsi
index 2270ac73bfca..5db30b5fb076 100644
--- a/arch/arm/dts/dragonboard820c-uboot.dtsi
+++ b/arch/arm/dts/dragonboard820c-uboot.dtsi
@@ -24,10 +24,6 @@
 		clock-controller at 300000 {
 			u-boot,dm-pre-reloc;
 		};
-
-		serial at 75b0000 {
-			u-boot,dm-pre-reloc;
-		};
 	};
 };
 
diff --git a/arch/arm/dts/qcom-ipq4019.dtsi b/arch/arm/dts/qcom-ipq4019.dtsi
index dee3159e5893..22a4e059f057 100644
--- a/arch/arm/dts/qcom-ipq4019.dtsi
+++ b/arch/arm/dts/qcom-ipq4019.dtsi
@@ -90,7 +90,6 @@
 			clocks = <&gcc GCC_BLSP1_UART1_APPS_CLK>;
 			bit-rate = <0xFF>;
 			status = "disabled";
-			u-boot,dm-pre-reloc;
 		};
 
 		blsp1_spi1: spi at 78b5000 {
diff --git a/arch/arm/dts/qcs404-evb-uboot.dtsi b/arch/arm/dts/qcs404-evb-uboot.dtsi
index c73d71e8c7c1..d77ae0fa930e 100644
--- a/arch/arm/dts/qcs404-evb-uboot.dtsi
+++ b/arch/arm/dts/qcs404-evb-uboot.dtsi
@@ -16,10 +16,6 @@
 		clock-controller at 1800000 {
 			u-boot,dm-pre-reloc;
 		};
-
-		serial at 78b1000 {
-			u-boot,dm-pre-reloc;
-		};
 	};
 };
 
diff --git a/drivers/serial/serial_msm.c b/drivers/serial/serial_msm.c
index 9c370cac323f..59a2cf27aaf1 100644
--- a/drivers/serial/serial_msm.c
+++ b/drivers/serial/serial_msm.c
@@ -251,4 +251,5 @@ U_BOOT_DRIVER(serial_msm) = {
 	.priv_auto	= sizeof(struct msm_serial_data),
 	.probe = msm_serial_probe,
 	.ops	= &msm_serial_ops,
+	.flags		= DM_FLAG_PRE_RELOC,
 };

-- 
2.40.0