summaryrefslogtreecommitdiff
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2015-12-08 14:44:16 -0600
committerArnd Bergmann <arnd@arndb.de>2015-12-15 23:53:21 +0100
commit16956fed35fecde2201e23458cda193526b19559 (patch)
tree540334f3232efb2bd79c00aaa75dca6d4a7bea5f /arch/arm/Kconfig
parenta8e2894c125f69aaea474592ebebd463bb7e1b0a (diff)
ARM: versatile: switch to DT only booting and remove legacy code
With DT support for clocks, irqchips, timers, and PCI now in place, DT based booting has feature parity with non-DT legacy boot. The final piece is actually enabling common clock support on Versatile. Enabling full DT support requires either removing the old Versatile clock code, updating the legacy boot to use the common clock code, or making DT and legacy boot mutually exclusive. Given that removing legacy boot code is the goal anyway, I am going with the 1st option. Signed-off-by: Rob Herring <robh@kernel.org> Cc: Russell King <linux@arm.linux.org.uk> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Mike Turquette <mturquette@linaro.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig13
1 files changed, 7 insertions, 6 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 34e1569a11ee..34e2162213cb 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -368,13 +368,16 @@ config ARCH_VERSATILE
select ARM_AMBA
select ARM_TIMER_SP804
select ARM_VIC
- select CLKDEV_LOOKUP
+ select CLKSRC_VERSATILE
+ select COMMON_CLK
+ select COMMON_CLK_VERSATILE
+ select CPU_ARM926T
select GENERIC_CLOCKEVENTS
- select HAVE_MACH_CLKDEV
select ICST
select PLAT_VERSATILE
- select PLAT_VERSATILE_CLOCK
- select PLAT_VERSATILE_SCHED_CLOCK
+ select MIGHT_HAVE_PCI
+ select SPARSE_IRQ
+ select USE_OF
select VERSATILE_FPGA_IRQ
help
This enables support for ARM Ltd Versatile board.
@@ -926,8 +929,6 @@ source "arch/arm/mach-uniphier/Kconfig"
source "arch/arm/mach-ux500/Kconfig"
-source "arch/arm/mach-versatile/Kconfig"
-
source "arch/arm/mach-vexpress/Kconfig"
source "arch/arm/plat-versatile/Kconfig"