summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2020-04-10 01:18:29 +0300
committerArnd Bergmann <arnd@arndb.de>2020-05-29 10:36:03 +0300
commite4df11cb99bff88cff976981eb8016ebd325a16f (patch)
tree29becfa59453fb6fddb2438ac5998206715055ae
parentd86ad463d6706d35167418660ae3293207ee9d1c (diff)
downloadlinux-e4df11cb99bff88cff976981eb8016ebd325a16f.tar.xz
ARM: zynq: Don't select CONFIG_ICST
CONFIG_ICST is for ARM Ltd reference platforms and isn't used by Zynq platform, so remove selecting it. It appears to be a copy-n-paste error. Cc: Michal Simek <michal.simek@xilinx.com> Signed-off-by: Rob Herring <robh@kernel.org> [arnd: remove the versatile clk driver change I added previously] Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r--arch/arm/mach-zynq/Kconfig1
-rw-r--r--drivers/clk/versatile/Kconfig2
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig
index 1ca633e3d024..43fb941dcd07 100644
--- a/arch/arm/mach-zynq/Kconfig
+++ b/arch/arm/mach-zynq/Kconfig
@@ -10,7 +10,6 @@ config ARCH_ZYNQ
select CADENCE_TTC_TIMER
select HAVE_ARM_SCU if SMP
select HAVE_ARM_TWD if SMP
- select ICST
select MFD_SYSCON
select PINCTRL
select PINCTRL_ZYNQ
diff --git a/drivers/clk/versatile/Kconfig b/drivers/clk/versatile/Kconfig
index 84a2596e9721..8c1b0e8e8d32 100644
--- a/drivers/clk/versatile/Kconfig
+++ b/drivers/clk/versatile/Kconfig
@@ -2,7 +2,7 @@
menu "Clock driver for ARM Reference designs"
depends on ARCH_INTEGRATOR || ARCH_REALVIEW || \
- ARCH_VERSATILE || ARCH_VEXPRESS || ARCH_ZYNQ || COMPILE_TEST
+ ARCH_VERSATILE || ARCH_VEXPRESS || COMPILE_TEST
config ICST
bool "Clock driver for ARM Reference designs ICST"