clk: iproc: Make clocks visible options

Make the clocks visible options that can be selected by anyone.  This
avoids the problems of:
 1) Select is a reverse dependency and is hard for people to understand
    and can sometimes be a pain to track down
 2) Build coverage goes down because configs are hidden
 3) Code bloat

Patch suggested by Stephen Boyd

Signed-off-by: Jon Mason <jonmason@broadcom.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>

diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig
index 34f0fca..7bf3ae7 100644 (file)
--- a/arch/arm/mach-bcm/Kconfig
+++ b/arch/arm/mach-bcm/Kconfig
@@ -15,7 +15,6 @@ config ARCH_BCM_IPROC
        select HAVE_ARM_SCU if SMP
        select HAVE_ARM_TWD if SMP
        select ARM_GLOBAL_TIMER
-       select COMMON_CLK_IPROC
        select CLKSRC_MMIO
        select GPIOLIB
        select ARM_AMBA

diff --git a/drivers/clk/bcm/Kconfig b/drivers/clk/bcm/Kconfig
index f287845..f21e9b7 100644 (file)
--- a/drivers/clk/bcm/Kconfig
+++ b/drivers/clk/bcm/Kconfig
@@ -19,8 +19,36 @@ config CLK_BCM_KONA
          in the BCM281xx and BCM21664 families.
 
 config COMMON_CLK_IPROC
-       bool
+       bool "Broadcom iProc clock support"
+       depends on ARCH_BCM_IPROC || COMPILE_TEST
        depends on COMMON_CLK
+       default ARCH_BCM_IPROC
        help
          Enable common clock framework support for Broadcom SoCs
          based on the iProc architecture
+
+if COMMON_CLK_IPROC
+
+config CLK_BCM_CYGNUS
+       bool "Broadcom Cygnus clock support"
+       depends on ARCH_BCM_CYGNUS || COMPILE_TEST
+       default ARCH_BCM_CYGNUS
+       help
+         Enable common clock framework support for the Broadcom Cygnus SoC
+
+config CLK_BCM_NSP
+       bool "Broadcom Northstar/Northstar Plus clock support"
+       depends on ARCH_BCM_5301X || ARCH_BCM_NSP || COMPILE_TEST
+       default ARCH_BCM_5301X || ARCH_BCM_NSP
+       help
+         Enable common clock framework support for the Broadcom Northstar and
+         Northstar Plus SoCs
+
+config CLK_BCM_NS2
+       bool "Broadcom Northstar 2 clock support"
+       depends on ARCH_BCM_IPROC || COMPILE_TEST
+       default ARCH_BCM_IPROC
+       help
+         Enable common clock framework support for the Broadcom Northstar 2 SoC
+
+endif

diff --git a/drivers/clk/bcm/Makefile b/drivers/clk/bcm/Makefile
index 1d79bd2..123f377 100644 (file)
--- a/drivers/clk/bcm/Makefile
+++ b/drivers/clk/bcm/Makefile
@@ -6,7 +6,6 @@ obj-$(CONFIG_CLK_BCM_KONA)      += clk-bcm21664.o
 obj-$(CONFIG_COMMON_CLK_IPROC) += clk-iproc-armpll.o clk-iproc-pll.o clk-iproc-asiu.o
 obj-$(CONFIG_ARCH_BCM2835)     += clk-bcm2835.o
 obj-$(CONFIG_ARCH_BCM2835)     += clk-bcm2835-aux.o
-obj-$(CONFIG_COMMON_CLK_IPROC) += clk-ns2.o
-obj-$(CONFIG_ARCH_BCM_CYGNUS)  += clk-cygnus.o
-obj-$(CONFIG_ARCH_BCM_NSP)     += clk-nsp.o
-obj-$(CONFIG_ARCH_BCM_5301X)   += clk-nsp.o
+obj-$(CONFIG_CLK_BCM_CYGNUS)   += clk-cygnus.o
+obj-$(CONFIG_CLK_BCM_NSP)      += clk-nsp.o
+obj-$(CONFIG_CLK_BCM_NS2)      += clk-ns2.o