aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/clk/bcm
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2015-10-15 15:48:24 -0400
committerStephen Boyd <sboyd@codeaurora.org>2015-10-21 19:52:57 -0400
commit1e9bc9d6369ba73885e4786b48f954f05348c3cb (patch)
tree37d763eab93d2eb3da52824129ad249eb45304d5 /drivers/clk/bcm
parent6ff33f3902c3b1c5d0db6b1e2c70b6d76fba357f (diff)
ARM: cygnus: fix link failures when CONFIG_COMMON_CLK_IPROC is disabled
When CONFIG_CYGNUS is set but CONFIG_COMMON_CLK_IPROC is disabled, the following link failures are caused: drivers/built-in.o: In function `cygnus_armpll_init': :(.init.text+0x1d290): undefined reference to `iproc_armpll_setup' drivers/built-in.o: In function `cygnus_genpll_clk_init': :(.init.text+0x1d2c4): undefined reference to `iproc_pll_clk_setup' drivers/built-in.o: In function `cygnus_lcpll0_clk_init': :(.init.text+0x1d304): undefined reference to `iproc_pll_clk_setup' drivers/built-in.o: In function `cygnus_mipipll_clk_init': :(.init.text+0x1d344): undefined reference to `iproc_pll_clk_setup' drivers/built-in.o: In function `cygnus_asiu_init': :(.init.text+0x1d370): undefined reference to `iproc_asiu_setup' It is fixed it by always selecting COMMON_CLK_IPROC from ARCH_BCM_IPROC, and making COMMON_CLK_IPROC a silent option (thus preventing it from being erroneously disabled by a user). Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Jon Mason <jonmason@broadcom.com> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Diffstat (limited to 'drivers/clk/bcm')
-rw-r--r--drivers/clk/bcm/Kconfig4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/clk/bcm/Kconfig b/drivers/clk/bcm/Kconfig
index 88febf53b276..46ee475a1d76 100644
--- a/drivers/clk/bcm/Kconfig
+++ b/drivers/clk/bcm/Kconfig
@@ -9,10 +9,8 @@ config CLK_BCM_KONA
9 in the BCM281xx and BCM21664 families. 9 in the BCM281xx and BCM21664 families.
10 10
11config COMMON_CLK_IPROC 11config COMMON_CLK_IPROC
12 bool "Broadcom iProc clock support" 12 bool
13 depends on ARCH_BCM_IPROC
14 depends on COMMON_CLK 13 depends on COMMON_CLK
15 default ARCH_BCM_IPROC
16 help 14 help
17 Enable common clock framework support for Broadcom SoCs 15 Enable common clock framework support for Broadcom SoCs
18 based on the iProc architecture 16 based on the iProc architecture