[PATCH v2 7/9] serial: msm_geni: Always bind before relocation

Konrad Dybcio konrad.dybcio at linaro.org
Mon Mar 27 12:45:05 CEST 2023


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/dragonboard845c-uboot.dtsi | 4 ----
 arch/arm/dts/starqltechn-uboot.dtsi     | 3 ---
 drivers/serial/serial_msm_geni.c        | 1 +
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/arch/arm/dts/dragonboard845c-uboot.dtsi b/arch/arm/dts/dragonboard845c-uboot.dtsi
index 9071eb9d8d55..d48df2b90b4a 100644
--- a/arch/arm/dts/dragonboard845c-uboot.dtsi
+++ b/arch/arm/dts/dragonboard845c-uboot.dtsi
@@ -10,10 +10,6 @@
 {
 	soc {
 		u-boot,dm-pre-reloc;
-
-		serial at a84000 {
-			u-boot,dm-pre-reloc;
-		};
 	};
 };
 
diff --git a/arch/arm/dts/starqltechn-uboot.dtsi b/arch/arm/dts/starqltechn-uboot.dtsi
index 0e82fe45ff0f..ee726e0283bf 100644
--- a/arch/arm/dts/starqltechn-uboot.dtsi
+++ b/arch/arm/dts/starqltechn-uboot.dtsi
@@ -13,9 +13,6 @@
 	};
 	soc {
 		u-boot,dm-pre-reloc;
-		serial at a84000 {
-			u-boot,dm-pre-reloc;
-		};
 	};
 };
 
diff --git a/drivers/serial/serial_msm_geni.c b/drivers/serial/serial_msm_geni.c
index 6c9371c4e69d..08906ad56918 100644
--- a/drivers/serial/serial_msm_geni.c
+++ b/drivers/serial/serial_msm_geni.c
@@ -566,6 +566,7 @@ U_BOOT_DRIVER(serial_msm_geni) = {
 	.priv_auto = sizeof(struct msm_serial_data),
 	.probe = msm_serial_probe,
 	.ops = &msm_serial_ops,
+	.flags		= DM_FLAG_PRE_RELOC,
 };
 
 #ifdef CONFIG_DEBUG_UART_MSM_GENI

-- 
2.40.0



More information about the U-Boot mailing list