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

Signed-off-by: Konrad Dybcio <konrad.dyb...@linaro.org>
---
 arch/arm/dts/dragonboard410c-uboot.dtsi       | 8 --------
 arch/arm/dts/dragonboard820c-uboot.dtsi       | 8 --------
 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           | 6 ------
 arch/arm/mach-snapdragon/pinctrl-snapdragon.c | 1 +
 7 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/arch/arm/dts/dragonboard410c-uboot.dtsi 
b/arch/arm/dts/dragonboard410c-uboot.dtsi
index 1a7c25c704d4..ca00b49bc844 100644
--- a/arch/arm/dts/dragonboard410c-uboot.dtsi
+++ b/arch/arm/dts/dragonboard410c-uboot.dtsi
@@ -13,14 +13,6 @@
 
        soc {
                u-boot,dm-pre-reloc;
-
-               pinctrl@1000000 {
-                       u-boot,dm-pre-reloc;
-
-                       uart {
-                               u-boot,dm-pre-reloc;
-                       };
-               };
        };
 };
 
diff --git a/arch/arm/dts/dragonboard820c-uboot.dtsi 
b/arch/arm/dts/dragonboard820c-uboot.dtsi
index 7daee3789f96..0670a9478290 100644
--- a/arch/arm/dts/dragonboard820c-uboot.dtsi
+++ b/arch/arm/dts/dragonboard820c-uboot.dtsi
@@ -12,14 +12,6 @@
 
        soc {
                u-boot,dm-pre-reloc;
-
-               pinctrl@1010000 {
-                       u-boot,dm-pre-reloc;
-
-                       uart {
-                               u-boot,dm-pre-reloc;
-                       };
-               };
        };
 };
 
diff --git a/arch/arm/dts/dragonboard845c-uboot.dtsi 
b/arch/arm/dts/dragonboard845c-uboot.dtsi
index 60adcca00b5c..9071eb9d8d55 100644
--- a/arch/arm/dts/dragonboard845c-uboot.dtsi
+++ b/arch/arm/dts/dragonboard845c-uboot.dtsi
@@ -14,10 +14,6 @@
                serial@a84000 {
                        u-boot,dm-pre-reloc;
                };
-
-               pinctrl_north@3900000 {
-                       u-boot,dm-pre-reloc;
-               };
        };
 };
 
diff --git a/arch/arm/dts/qcom-ipq4019.dtsi b/arch/arm/dts/qcom-ipq4019.dtsi
index 2fcab5412147..a92090057b37 100644
--- a/arch/arm/dts/qcom-ipq4019.dtsi
+++ b/arch/arm/dts/qcom-ipq4019.dtsi
@@ -80,7 +80,6 @@
                        gpio-count = <100>;
                        gpio-bank-name="soc";
                        #gpio-cells = <2>;
-                       u-boot,dm-pre-reloc;
                };
 
                blsp1_uart1: serial@78af000 {
diff --git a/arch/arm/dts/qcs404-evb-uboot.dtsi 
b/arch/arm/dts/qcs404-evb-uboot.dtsi
index afa711ad979c..80d7d4c25856 100644
--- a/arch/arm/dts/qcs404-evb-uboot.dtsi
+++ b/arch/arm/dts/qcs404-evb-uboot.dtsi
@@ -8,10 +8,6 @@
 / {
        soc {
                u-boot,dm-pre-reloc;
-
-               pinctrl_north@1300000 {
-                       u-boot,dm-pre-reloc;
-               };
        };
 };
 
diff --git a/arch/arm/dts/starqltechn-uboot.dtsi 
b/arch/arm/dts/starqltechn-uboot.dtsi
index 8e3cf3829421..0e82fe45ff0f 100644
--- a/arch/arm/dts/starqltechn-uboot.dtsi
+++ b/arch/arm/dts/starqltechn-uboot.dtsi
@@ -16,12 +16,6 @@
                serial@a84000 {
                        u-boot,dm-pre-reloc;
                };
-               gpio_north@3900000 {
-                       u-boot,dm-pre-reloc;
-               };
-               pinctrl_north@3900000 {
-                       u-boot,dm-pre-reloc;
-               };
        };
 };
 
diff --git a/arch/arm/mach-snapdragon/pinctrl-snapdragon.c 
b/arch/arm/mach-snapdragon/pinctrl-snapdragon.c
index 826dc5148661..9f261d70e4d3 100644
--- a/arch/arm/mach-snapdragon/pinctrl-snapdragon.c
+++ b/arch/arm/mach-snapdragon/pinctrl-snapdragon.c
@@ -163,4 +163,5 @@ U_BOOT_DRIVER(pinctrl_snapdraon) = {
        .ops            = &msm_pinctrl_ops,
        .probe          = msm_pinctrl_probe,
        .bind           = msm_pinctrl_bind,
+       .flags          = DM_FLAG_PRE_RELOC,
 };

-- 
2.40.0

Reply via email to