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

clk: bcm: Make COMMON_CLK_IPROC into a library

The broadcom clk driver Kconfig file selects and depends on the
COMMON_CLK_IPROC config for different SoC specific drivers. Let's
simplify this by always selecting the COMMON_CLK_IPROC config,
turning it into a set of library code. We still want to retain
the SoC specific options, so we leave those in place. Since we're
here we also drop COMMON_CLK dependency because that's implicitly
handled by including this file in drivers/clk/Kconfig in the
right place and also make CLK_BCM_KONA default to y on the
architecture it exists for instead of plain default y.

Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: Ray Jui <ray.jui@broadcom.com>
Cc: Jon Mason <jonmason@broadcom.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>

Stephen Boyd 100edfe3 44709358

+5 -11
+5 -11
drivers/clk/bcm/Kconfig
··· 1 1 config CLK_BCM_63XX 2 2 bool "Broadcom BCM63xx clock support" 3 3 depends on ARCH_BCM_63XX || COMPILE_TEST 4 - depends on COMMON_CLK 5 4 select COMMON_CLK_IPROC 6 5 default ARCH_BCM_63XX 7 6 help ··· 10 11 config CLK_BCM_KONA 11 12 bool "Broadcom Kona CCU clock support" 12 13 depends on ARCH_BCM_MOBILE || COMPILE_TEST 13 - depends on COMMON_CLK 14 - default y 14 + default ARCH_BCM_MOBILE 15 15 help 16 16 Enable common clock framework support for Broadcom SoCs 17 17 using "Kona" style clock control units, including those 18 18 in the BCM281xx and BCM21664 families. 19 19 20 20 config COMMON_CLK_IPROC 21 - bool "Broadcom iProc clock support" 22 - depends on ARCH_BCM_IPROC || ARCH_BCM_63XX || COMPILE_TEST 23 - depends on COMMON_CLK 24 - default ARCH_BCM_IPROC 21 + bool 25 22 help 26 23 Enable common clock framework support for Broadcom SoCs 27 24 based on the iProc architecture 28 25 29 - if COMMON_CLK_IPROC 30 - 31 26 config CLK_BCM_CYGNUS 32 27 bool "Broadcom Cygnus clock support" 33 28 depends on ARCH_BCM_CYGNUS || COMPILE_TEST 29 + select COMMON_CLK_IPROC 34 30 default ARCH_BCM_CYGNUS 35 31 help 36 32 Enable common clock framework support for the Broadcom Cygnus SoC ··· 33 39 config CLK_BCM_NSP 34 40 bool "Broadcom Northstar/Northstar Plus clock support" 35 41 depends on ARCH_BCM_5301X || ARCH_BCM_NSP || COMPILE_TEST 42 + select COMMON_CLK_IPROC 36 43 default ARCH_BCM_5301X || ARCH_BCM_NSP 37 44 help 38 45 Enable common clock framework support for the Broadcom Northstar and ··· 42 47 config CLK_BCM_NS2 43 48 bool "Broadcom Northstar 2 clock support" 44 49 depends on ARCH_BCM_IPROC || COMPILE_TEST 50 + select COMMON_CLK_IPROC 45 51 default ARCH_BCM_IPROC 46 52 help 47 53 Enable common clock framework support for the Broadcom Northstar 2 SoC 48 - 49 - endif