[PATCH 02/15] ARM: move OFTREE and OFDEVICE up one level

[Sascha Hauer <s.hauer@pengutronix.de>]

All ARCH_MULTIARCH machines are probing from device tree, so select
the necessary symbols from ARCH_MULTIARCH rather than individually
from the machines.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/Kconfig           | 13 ++-----------
 arch/arm/mach-imx/Kconfig  |  7 -------
 arch/arm/mach-omap/Kconfig |  1 -
 3 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 6ebcb1577f..728438dcf6 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -43,6 +43,8 @@ choice
 
 config ARCH_MULTIARCH
 	select HAVE_PBL_MULTI_IMAGES
+	select OFTREE
+	select OFDEVICE
 	bool "Allow multiple archs to be selected"
 
 config ARCH_AT91
@@ -182,8 +184,6 @@ config ARCH_ARM64_VIRT
 	bool "ARM64 QEMU Virt board"
 	depends on 64BIT
 	select CPU_V8
-	select OFDEVICE
-	select OFTREE
 	select RELOCATABLE
 	select ARM_AMBA
 	select BOARD_ARM_VIRT
@@ -199,8 +199,6 @@ config ARCH_BCM283X
 	select ARM_AMBA
 	select HAS_DEBUG_LL
 	select RELOCATABLE
-	select OFTREE
-	select OFDEVICE
 
 config ARCH_IMX
 	bool "Freescale iMX-based"
@@ -229,8 +227,6 @@ config ARCH_LAYERSCAPE
 	select COMMON_CLK
 	select COMMON_CLK_OF_PROVIDER
 	select HW_HAS_PCI
-	select OFTREE
-	select OFDEVICE
 	select ARM_USE_COMPRESSED_DTB
 	select OF_DMA_COHERENCY
 
@@ -251,7 +247,6 @@ config ARCH_ROCKCHIP
 	select GPIOLIB
 	select PINCTRL
 	select PINCTRL_ROCKCHIP
-	select OFTREE
 	select HAS_DEBUG_LL
 	imply GPIO_ROCKCHIP
 
@@ -288,8 +283,6 @@ config ARCH_VEXPRESS
 	select AMBA_SP804
 	select COMMON_CLK
 	select COMMON_CLK_OF_PROVIDER
-	select OFTREE
-	select OFDEVICE
 	select RELOCATABLE
 
 config ARCH_ZYNQMP
@@ -301,8 +294,6 @@ config ARCH_ZYNQMP
 	select COMMON_CLK
 	select COMMON_CLK_OF_PROVIDER
 	select GPIOLIB
-	select OFDEVICE
-	select OFTREE
 	select RELOCATABLE
 	select HAS_MACB
 
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 6125813773..4d10def3c2 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -124,7 +124,6 @@ config ARCH_IMX6
 	select ARCH_HAS_IMX_GPT
 	select CPU_V7
 	select PINCTRL_IMX_IOMUX_V3
-	select OFDEVICE
 	select COMMON_CLK_OF_PROVIDER
 	select HW_HAS_PCI
 
@@ -144,7 +143,6 @@ config ARCH_IMX7
 	bool
 	select CPU_V7
 	select PINCTRL_IMX_IOMUX_V3
-	select OFTREE
 	select COMMON_CLK_OF_PROVIDER
 	select ARCH_HAS_FEC_IMX
 	select ARCH_HAS_IMX_GPT
@@ -154,7 +152,6 @@ config ARCH_IMX8M
 	bool
 	select CPU_V8
 	select PINCTRL_IMX_IOMUX_V3
-	select OFTREE
 	select COMMON_CLK_OF_PROVIDER
 	select ARCH_HAS_FEC_IMX
 	select HW_HAS_PCI
@@ -189,7 +186,6 @@ config ARCH_IMX93
 	select ARCH_IMX9
 	select CPU_V8
 	select PINCTRL_IMX_IOMUX_V3
-	select OFTREE
 	select COMMON_CLK_OF_PROVIDER
 	select ARM_USE_COMPRESSED_DTB
 	select ARCH_HAS_FEC_IMX
@@ -200,8 +196,6 @@ config ARCH_VF610
 	select ARCH_HAS_FEC_IMX
 	select CPU_V7
 	select PINCTRL
-	select OFDEVICE
-	select OFTREE
 	select COMMON_CLK
 	select COMMON_CLK_OF_PROVIDER
 	select NVMEM
@@ -825,7 +819,6 @@ config HABV4
 	select NVMEM
 	select IMX_OCOTP
 	depends on ARCH_IMX6 || ARCH_IMX8M
-	depends on OFDEVICE
 	help
 	  High Assurance Boot, as found on i.MX28/i.MX6/i.MX8M.
 
diff --git a/arch/arm/mach-omap/Kconfig b/arch/arm/mach-omap/Kconfig
index f0e035e31e..cb1ba9f7eb 100644
--- a/arch/arm/mach-omap/Kconfig
+++ b/arch/arm/mach-omap/Kconfig
@@ -39,7 +39,6 @@ config ARCH_AM33XX
 	bool
 	select CPU_V7
 	select GENERIC_GPIO
-	select OFTREE
 	select CLOCKSOURCE_TI_DM
 	select ARM_USE_COMPRESSED_DTB
 	help
-- 
2.39.2