diff options
author | Stephen Boyd <sboyd@kernel.org> | 2020-08-03 22:52:05 +0200 |
---|---|---|
committer | Stephen Boyd <sboyd@kernel.org> | 2020-08-03 22:52:05 +0200 |
commit | ba857b212210df018adb5885656c9e890062f883 (patch) | |
tree | 6f3b54e33004117b757dfa17d609d47cd9cce583 /drivers/clk/Kconfig | |
parent | clk: Drop duplicate selection in Kconfig (diff) | |
parent | clk: Specify IOMEM dependency for HSDK pll driver (diff) | |
download | linux-ba857b212210df018adb5885656c9e890062f883.tar.xz linux-ba857b212210df018adb5885656c9e890062f883.zip |
Merge branch 'clk-fixes' into clk-kconfig
Need to merge this up to get the IOMEM dependency patch on top that is
broken and fixed in the next commit.
* clk-fixes:
clk: Specify IOMEM dependency for HSDK pll driver
clk: AST2600: Add mux for EMMC clock
clk: mvebu: ARMADA_AP_CPU_CLK needs to select ARMADA_AP_CP_HELPER
Diffstat (limited to 'drivers/clk/Kconfig')
-rw-r--r-- | drivers/clk/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig index 42301ebf06e9..690a2587e0c5 100644 --- a/drivers/clk/Kconfig +++ b/drivers/clk/Kconfig @@ -50,6 +50,7 @@ source "drivers/clk/versatile/Kconfig" config CLK_HSDK bool "PLL Driver for HSDK platform" depends on OF || COMPILE_TEST + depends on IOMEM help This driver supports the HSDK core, system, ddr, tunnel and hdmi PLLs control. |