summaryrefslogtreecommitdiff
path: root/drivers/clk/hisilicon/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-09-15 02:58:35 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2015-09-15 02:58:35 +0300
commitd25ed277fbd4c20247286fda2014ae6a2b88316b (patch)
treeee90f683723a6b22b168775e7f0b0294e77ec66b /drivers/clk/hisilicon/Kconfig
parent9c488de24f7264f08d341024bffdd637b4d04c96 (diff)
parent3bba75a2ec32bd5fa7024a4de3b8cf9ee113a76a (diff)
downloadlinux-d25ed277fbd4c20247286fda2014ae6a2b88316b.tar.xz
Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
Pull clk fixes from Stephen Boyd: "A couple build fixes for drivers introduced in the merge window and a handful of patches to add more critical clocks on rockchip SoCs that are affected by newly introduced gpio clock handling" * tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: clk: rockchip: Add pclk_peri to critical clocks on RK3066/RK3188 clk: rockchip: add pclk_cpu to the list of rk3188 critical clocks clk: rockchip: handle critical clocks after registering all clocks clk: Hi6220: separately build stub clock driver clk: h8s2678: Fix compile error
Diffstat (limited to 'drivers/clk/hisilicon/Kconfig')
-rw-r--r--drivers/clk/hisilicon/Kconfig8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/clk/hisilicon/Kconfig b/drivers/clk/hisilicon/Kconfig
index 2c16807341dc..e43485448612 100644
--- a/drivers/clk/hisilicon/Kconfig
+++ b/drivers/clk/hisilicon/Kconfig
@@ -1,6 +1,12 @@
config COMMON_CLK_HI6220
bool "Hi6220 Clock Driver"
- depends on (ARCH_HISI || COMPILE_TEST) && MAILBOX
+ depends on ARCH_HISI || COMPILE_TEST
default ARCH_HISI
help
Build the Hisilicon Hi6220 clock driver based on the common clock framework.
+
+config STUB_CLK_HI6220
+ bool "Hi6220 Stub Clock Driver"
+ depends on COMMON_CLK_HI6220 && MAILBOX
+ help
+ Build the Hisilicon Hi6220 stub clock driver.