clk: remove COMMON_CLK_DISABLE_UNUSED

Exposing this option generates confusion and incorrect behavior for
single-image builds across platforms.  Enable this behavior permanently.

Signed-off-by: Mike Turquette <mturquette@linaro.org>
Acked-by: Saravana Kannan <skannan@codeaurora.org>

diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
index f05a60dc1a032ab10c7d5b94aba73b49d04a899a..4864407e3fc424814d5c5f46450b45c143c375f5 100644 (file)
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@ -23,17 +23,6 @@ config COMMON_CLK
 menu "Common Clock Framework"
        depends on COMMON_CLK
 
-config COMMON_CLK_DISABLE_UNUSED
-       bool "Disabled unused clocks at boot"
-       depends on COMMON_CLK
-       ---help---
-         Traverses the entire clock tree and disables any clocks that are
-         enabled in hardware but have not been enabled by any device drivers.
-         This saves power and keeps the software model of the clock in line
-         with reality.
-
-         If in doubt, say "N".
-
 config COMMON_CLK_DEBUG
        bool "DebugFS representation of clock tree"
        depends on COMMON_CLK

diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 7ceca0e8645a1c239780f6630ca5f26a5b1819f2..e5d5dc13bcfd7067690a0106eb3cf011ff8b1fb1 100644 (file)
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -196,7 +196,6 @@ late_initcall(clk_debug_init);
 static inline int clk_debug_register(struct clk *clk) { return 0; }
 #endif
 
-#ifdef CONFIG_COMMON_CLK_DISABLE_UNUSED
 /* caller must hold prepare_lock */
 static void clk_disable_unused_subtree(struct clk *clk)
 {
@@ -246,7 +245,6 @@ static int clk_disable_unused(void)
        return 0;
 }
 late_initcall(clk_disable_unused);
-#endif
 
 /***    helper functions   ***/