[PATCH v2 5/9] arch: snapdragon: clock: Always bind before relocation

Konrad Dybcio konrad.dybcio at linaro.org
Mon Mar 27 12:45:03 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/dragonboard410c-uboot.dtsi     | 4 ----
 arch/arm/dts/dragonboard820c-uboot.dtsi     | 4 ----
 arch/arm/dts/dragonboard845c-uboot.dtsi     | 4 ----
 arch/arm/dts/qcom-ipq4019.dtsi              | 1 -
 arch/arm/dts/qcs404-evb-uboot.dtsi          | 4 ----
 arch/arm/dts/starqltechn-uboot.dtsi         | 3 ---
 arch/arm/mach-snapdragon/clock-snapdragon.c | 1 +
 7 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/arch/arm/dts/dragonboard410c-uboot.dtsi b/arch/arm/dts/dragonboard410c-uboot.dtsi
index 1d7b31d7e267..1a7c25c704d4 100644
--- a/arch/arm/dts/dragonboard410c-uboot.dtsi
+++ b/arch/arm/dts/dragonboard410c-uboot.dtsi
@@ -21,10 +21,6 @@
 				u-boot,dm-pre-reloc;
 			};
 		};
-
-		qcom,gcc at 1800000 {
-			u-boot,dm-pre-reloc;
-		};
 	};
 };
 
diff --git a/arch/arm/dts/dragonboard820c-uboot.dtsi b/arch/arm/dts/dragonboard820c-uboot.dtsi
index 5db30b5fb076..7daee3789f96 100644
--- a/arch/arm/dts/dragonboard820c-uboot.dtsi
+++ b/arch/arm/dts/dragonboard820c-uboot.dtsi
@@ -20,10 +20,6 @@
 				u-boot,dm-pre-reloc;
 			};
 		};
-
-		clock-controller at 300000 {
-			u-boot,dm-pre-reloc;
-		};
 	};
 };
 
diff --git a/arch/arm/dts/dragonboard845c-uboot.dtsi b/arch/arm/dts/dragonboard845c-uboot.dtsi
index 8b5a7ee573b3..60adcca00b5c 100644
--- a/arch/arm/dts/dragonboard845c-uboot.dtsi
+++ b/arch/arm/dts/dragonboard845c-uboot.dtsi
@@ -15,10 +15,6 @@
 			u-boot,dm-pre-reloc;
 		};
 
-		clock-controller at 100000 {
-			u-boot,dm-pre-reloc;
-		};
-
 		pinctrl_north at 3900000 {
 			u-boot,dm-pre-reloc;
 		};
diff --git a/arch/arm/dts/qcom-ipq4019.dtsi b/arch/arm/dts/qcom-ipq4019.dtsi
index 22a4e059f057..2fcab5412147 100644
--- a/arch/arm/dts/qcom-ipq4019.dtsi
+++ b/arch/arm/dts/qcom-ipq4019.dtsi
@@ -56,7 +56,6 @@
 			reg = <0x1800000 0x60000>;
 			#clock-cells = <1>;
 			#reset-cells = <1>;
-			u-boot,dm-pre-reloc;
 		};
 
 		rng: rng at 22000 {
diff --git a/arch/arm/dts/qcs404-evb-uboot.dtsi b/arch/arm/dts/qcs404-evb-uboot.dtsi
index d77ae0fa930e..afa711ad979c 100644
--- a/arch/arm/dts/qcs404-evb-uboot.dtsi
+++ b/arch/arm/dts/qcs404-evb-uboot.dtsi
@@ -12,10 +12,6 @@
 		pinctrl_north at 1300000 {
 			u-boot,dm-pre-reloc;
 		};
-
-		clock-controller at 1800000 {
-			u-boot,dm-pre-reloc;
-		};
 	};
 };
 
diff --git a/arch/arm/dts/starqltechn-uboot.dtsi b/arch/arm/dts/starqltechn-uboot.dtsi
index 8d5d09c3a509..8e3cf3829421 100644
--- a/arch/arm/dts/starqltechn-uboot.dtsi
+++ b/arch/arm/dts/starqltechn-uboot.dtsi
@@ -16,9 +16,6 @@
 		serial at a84000 {
 			u-boot,dm-pre-reloc;
 		};
-		clock-controller at 100000 {
-			u-boot,dm-pre-reloc;
-		};
 		gpio_north at 3900000 {
 			u-boot,dm-pre-reloc;
 		};
diff --git a/arch/arm/mach-snapdragon/clock-snapdragon.c b/arch/arm/mach-snapdragon/clock-snapdragon.c
index 0ac45dce9a92..d1af5d1fec7d 100644
--- a/arch/arm/mach-snapdragon/clock-snapdragon.c
+++ b/arch/arm/mach-snapdragon/clock-snapdragon.c
@@ -178,4 +178,5 @@ U_BOOT_DRIVER(clk_msm) = {
 	.ops		= &msm_clk_ops,
 	.priv_auto	= sizeof(struct msm_clk_priv),
 	.probe		= msm_clk_probe,
+	.flags		= DM_FLAG_PRE_RELOC,
 };

-- 
2.40.0



More information about the U-Boot mailing list