Merge branches 'clk-xilinx', 'clk-kunit', 'clk-cs2000' and 'clk-renesas' into clk...

[linux-2.6-microblaze.git] / drivers / clk / Kconfig

diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
index 3cdf334..2f0d40b 100644 (file)
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@ -197,6 +197,7 @@ config COMMON_CLK_CDCE925
 config COMMON_CLK_CS2000_CP
        tristate "Clock driver for CS2000 Fractional-N Clock Synthesizer & Clock Multiplier"
        depends on I2C
+       select REGMAP_I2C
        help
          If you say yes here you get support for the CS2000 clock multiplier.
 
@@ -330,9 +331,6 @@ config COMMON_CLK_PXA
        help
          Support for the Marvell PXA SoC.
 
-config COMMON_CLK_PIC32
-       def_bool COMMON_CLK && MACH_PIC32
-
 config COMMON_CLK_OXNAS
        bool "Clock driver for the OXNAS SoC Family"
        depends on ARCH_OXNAS || COMPILE_TEST
@@ -340,6 +338,15 @@ config COMMON_CLK_OXNAS
        help
          Support for the OXNAS SoC Family clocks.
 
+config COMMON_CLK_RS9_PCIE
+       tristate "Clock driver for Renesas 9-series PCIe clock generators"
+       depends on I2C
+       depends on OF
+       select REGMAP_I2C
+       help
+         This driver supports the Renesas 9-series PCIe clock generator
+         models 9FGV/9DBV/9DMV/9FGL/9DML/9QXL/9SQ.
+
 config COMMON_CLK_VC5
        tristate "Clock driver for IDT VersaClock 5,6 devices"
        depends on I2C
@@ -407,6 +414,7 @@ source "drivers/clk/keystone/Kconfig"
 source "drivers/clk/mediatek/Kconfig"
 source "drivers/clk/meson/Kconfig"
 source "drivers/clk/mstar/Kconfig"
+source "drivers/clk/microchip/Kconfig"
 source "drivers/clk/mvebu/Kconfig"
 source "drivers/clk/pistachio/Kconfig"
 source "drivers/clk/qcom/Kconfig"