Merge tag 'ux500-armsoc-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[cascardo/linux.git] / drivers / clk / Kconfig

diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
index de707b2..16f7d33 100644 (file)
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@ -6,9 +6,6 @@ config CLKDEV_LOOKUP
 config HAVE_CLK_PREPARE
        bool
 
-config HAVE_MACH_CLKDEV
-       bool
-
 config COMMON_CLK
        bool
        select HAVE_CLK_PREPARE
@@ -99,6 +96,14 @@ config COMMON_CLK_SI570
          This driver supports Silicon Labs 570/571/598/599 programmable
          clock generators.
 
+config COMMON_CLK_CDCE706
+       tristate "Clock driver for TI CDCE706 clock synthesizer"
+       depends on I2C
+       select REGMAP_I2C
+       select RATIONAL
+       ---help---
+         This driver supports TI CDCE706 programmable 3-PLL clock synthesizer.
+
 config COMMON_CLK_CDCE925
        tristate "Clock driver for TI CDCE925 devices"
        depends on I2C
@@ -190,15 +195,7 @@ config COMMON_CLK_PWM
 config COMMON_CLK_PXA
        def_bool COMMON_CLK && ARCH_PXA
        ---help---
-         Sypport for the Marvell PXA SoC.
-
-config COMMON_CLK_CDCE706
-       tristate "Clock driver for TI CDCE706 clock synthesizer"
-       depends on I2C
-       select REGMAP_I2C
-       select RATIONAL
-       ---help---
-         This driver supports TI CDCE706 programmable 3-PLL clock synthesizer.
+         Support for the Marvell PXA SoC.
 
 source "drivers/clk/bcm/Kconfig"
 source "drivers/clk/hisilicon/Kconfig"
@@ -206,5 +203,6 @@ source "drivers/clk/mvebu/Kconfig"
 source "drivers/clk/qcom/Kconfig"
 source "drivers/clk/samsung/Kconfig"
 source "drivers/clk/tegra/Kconfig"
+source "drivers/clk/ti/Kconfig"
 
 endmenu