Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

clk: versatile: Split config options for sp810 and vexpress_osc

Move the Kconfig entry for Versatile (& Express) clock drivers
into a separate file and add individual options for sp810
and vexpress_osc drivers, as they are optional in some
configurations and may have separate dependencies.

Signed-off-by: Pawel Moll <pawel.moll@arm.com>
Acked-by: Mike Turquette <mturquette@linaro.org>

+30 -10
+1 -8
drivers/clk/Kconfig
··· 30 30 Supports the clocking subsystem of the WM831x/2x series of 31 31 PMICs from Wolfson Microlectronics. 32 32 33 - config COMMON_CLK_VERSATILE 34 - bool "Clock driver for ARM Reference designs" 35 - depends on ARCH_INTEGRATOR || ARCH_REALVIEW || ARCH_VEXPRESS || ARM64 36 - ---help--- 37 - Supports clocking on ARM Reference designs: 38 - - Integrator/AP and Integrator/CP 39 - - RealView PB1176, EB, PB11MP and PBX 40 - - Versatile Express 33 + source "drivers/clk/versatile/Kconfig" 41 34 42 35 config COMMON_CLK_MAX77686 43 36 tristate "Clock driver for Maxim 77686 MFD"
+26
drivers/clk/versatile/Kconfig
··· 1 + config COMMON_CLK_VERSATILE 2 + bool "Clock driver for ARM Reference designs" 3 + depends on ARCH_INTEGRATOR || ARCH_REALVIEW || ARCH_VEXPRESS || ARM64 4 + ---help--- 5 + Supports clocking on ARM Reference designs: 6 + - Integrator/AP and Integrator/CP 7 + - RealView PB1176, EB, PB11MP and PBX 8 + - Versatile Express 9 + 10 + config CLK_SP810 11 + bool "Clock driver for ARM SP810 System Controller" 12 + depends on COMMON_CLK_VERSATILE 13 + default y if ARCH_VEXPRESS 14 + ---help--- 15 + Supports clock muxing (REFCLK/TIMCLK to TIMERCLKEN0-3) capabilities 16 + of the ARM SP810 System Controller cell. 17 + 18 + config CLK_VEXPRESS_OSC 19 + bool "Clock driver for Versatile Express OSC clock generators" 20 + depends on COMMON_CLK_VERSATILE 21 + depends on VEXPRESS_CONFIG 22 + default y if ARCH_VEXPRESS 23 + ---help--- 24 + Simple regmap-based driver driving clock generators on Versatile 25 + Express platforms hidden behind its configuration infrastructure, 26 + commonly known as OSCs.
+3 -2
drivers/clk/versatile/Makefile
··· 3 3 obj-$(CONFIG_ARCH_INTEGRATOR) += clk-integrator.o 4 4 obj-$(CONFIG_INTEGRATOR_IMPD1) += clk-impd1.o 5 5 obj-$(CONFIG_ARCH_REALVIEW) += clk-realview.o 6 - obj-$(CONFIG_ARCH_VEXPRESS) += clk-vexpress.o clk-sp810.o 7 - obj-$(CONFIG_VEXPRESS_CONFIG) += clk-vexpress-osc.o 6 + obj-$(CONFIG_ARCH_VEXPRESS) += clk-vexpress.o 7 + obj-$(CONFIG_CLK_SP810) += clk-sp810.o 8 + obj-$(CONFIG_CLK_VEXPRESS_OSC) += clk-vexpress-osc.o