From: Rob Herring Date: Thu, 9 Apr 2020 22:18:29 +0000 (-0600) Subject: ARM: zynq: Don't select CONFIG_ICST X-Git-Tag: v5.8-rc1~140^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e4df11cb99bff88cff976981eb8016ebd325a16f;p=thirdparty%2Fkernel%2Flinux.git 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 Signed-off-by: Rob Herring [arnd: remove the versatile clk driver change I added previously] Signed-off-by: Arnd Bergmann --- diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig index 1ca633e3d024d..43fb941dcd073 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 84a2596e97215..8c1b0e8e8d329 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"