mach-snapdragon: use OF_UPSTREAM

Switch to using upstream DT from dts/upstream.

Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Reviewed-by: Sumit Garg <sumit.garg@linaro.org>
Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>

diff --git a/MAINTAINERS b/MAINTAINERS
index c0d2b5138fca16923a6cc5f04d7e39c49186978b..d0a4a28b401d5707382f2c0f288f688408f2fa80 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -606,10 +606,6 @@ R: Sumit Garg <sumit.garg@linaro.org>
 L:     u-boot-qcom@groups.io
 S:     Maintained
 T:     git https://source.denx.de/u-boot/custodians/u-boot-snapdragon.git
-F:     arch/arm/dts/msm8*.dtsi
-F:     arch/arm/dts/pm8???.dtsi
-F:     arch/arm/dts/pms405.dtsi
-F:     arch/arm/dts/sdm845.dtsi
 F:     drivers/*/*/pm8???-*
 F:     drivers/gpio/msm_gpio.c
 F:     drivers/mmc/msm_sdhci.c

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 9b17ad3e3f8e7a75b814f3455c171e9a35a586e6..def7cca2c1c0c90388e136293d929e2ae2c304db 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1090,6 +1090,7 @@ config ARCH_SNAPDRAGON
        select OF_BOARD
        select SAVE_PREV_BL_FDT_ADDR
        select LINUX_KERNEL_IMAGE_HEADER
+       imply OF_UPSTREAM
        imply CMD_DM
 
 config ARCH_SOCFPGA

diff --git a/configs/dragonboard410c_defconfig b/configs/dragonboard410c_defconfig
index 260a8349d3b22600496fe3b6d969e13785576ea6..9ef04fd455461d3b218743207318bce52f44a45f 100644 (file)
--- a/configs/dragonboard410c_defconfig
+++ b/configs/dragonboard410c_defconfig
@@ -9,7 +9,7 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
 CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x8007fff0
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0x0
-CONFIG_DEFAULT_DEVICE_TREE="apq8016-sbc"
+CONFIG_DEFAULT_DEVICE_TREE="qcom/apq8016-sbc"
 CONFIG_OF_LIBFDT_OVERLAY=y
 CONFIG_IDENT_STRING="\nQualcomm-DragonBoard 410C"
 CONFIG_SYS_LOAD_ADDR=0x80080000

diff --git a/configs/dragonboard820c_defconfig b/configs/dragonboard820c_defconfig
index ebc80eb2a46496ef06ebfc7d5c0469d7b8e3b660..f6b2cb09ba31d6a115effff5cb696542727bfc0e 100644 (file)
--- a/configs/dragonboard820c_defconfig
+++ b/configs/dragonboard820c_defconfig
@@ -7,7 +7,7 @@ CONFIG_SYS_MALLOC_LEN=0x804000
 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
 CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x8007fff0
 CONFIG_ENV_SIZE=0x4000
-CONFIG_DEFAULT_DEVICE_TREE="apq8096-db820c"
+CONFIG_DEFAULT_DEVICE_TREE="qcom/apq8096-db820c"
 CONFIG_IDENT_STRING="\nQualcomm-DragonBoard 820C"
 CONFIG_SYS_LOAD_ADDR=0x80080000
 CONFIG_DISTRO_DEFAULTS=y

diff --git a/configs/qcom_defconfig b/configs/qcom_defconfig
index ee3ed89cbc8a0efea4ec0045c24168e0eff110a6..218a9a769682b445a7f37699dc4dd6883dc091cf 100644 (file)
--- a/configs/qcom_defconfig
+++ b/configs/qcom_defconfig
@@ -2,7 +2,7 @@ CONFIG_ARM=y
 CONFIG_SKIP_LOWLEVEL_INIT=y
 CONFIG_POSITION_INDEPENDENT=y
 CONFIG_ARCH_SNAPDRAGON=y
-CONFIG_DEFAULT_DEVICE_TREE="sdm845-db845c"
+CONFIG_DEFAULT_DEVICE_TREE="qcom/sdm845-db845c"
 CONFIG_SYS_LOAD_ADDR=0x0
 CONFIG_BUTTON_CMD=y
 CONFIG_FIT=y