Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

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

diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
index b97974662a1f6c3c8095abed9f7997015a68e75f..801fa1cd03217cb54853fcfddcb49ab7c21a1478 100644 (file)
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@ -53,13 +53,12 @@ config COMMON_CLK_MAX9485
          This driver supports Maxim 9485 Programmable Audio Clock Generator
 
 config COMMON_CLK_RK808
-       tristate "Clock driver for RK805/RK808/RK818"
+       tristate "Clock driver for RK805/RK808/RK809/RK817/RK818"
        depends on MFD_RK808
        ---help---
-         This driver supports RK805, RK808 and RK818 crystal oscillator clock. These
-         multi-function devices have two fixed-rate oscillators,
-         clocked at 32KHz each. Clkout1 is always on, Clkout2 can off
-         by control register.
+         This driver supports RK805, RK809 and RK817, RK808 and RK818 crystal oscillator clock.
+         These multi-function devices have two fixed-rate oscillators, clocked at 32KHz each.
+         Clkout1 is always on, Clkout2 can off by control register.
 
 config COMMON_CLK_HI655X
        tristate "Clock driver for Hi655x" if EXPERT
@@ -91,6 +90,17 @@ config COMMON_CLK_SCPI
          This driver uses SCPI Message Protocol to interact with the
          firmware providing all the clock controls.
 
+config COMMON_CLK_SI5341
+       tristate "Clock driver for SiLabs 5341 and 5340 A/B/C/D devices"
+       depends on I2C
+       select REGMAP_I2C
+       help
+         This driver supports Silicon Labs Si5341 and Si5340 programmable clock
+         generators. Not all features of these chips are currently supported
+         by the driver, in particular it only supports XTAL input. The chip can
+         be pre-programmed to support other configurations and features not yet
+         implemented in the driver.
+
 config COMMON_CLK_SI5351
        tristate "Clock driver for SiLabs 5351A/B/C"
        depends on I2C
@@ -293,10 +303,10 @@ config COMMON_CLK_STM32H7
 
 config COMMON_CLK_BD718XX
        tristate "Clock driver for ROHM BD718x7 PMIC"
-       depends on MFD_ROHM_BD718XX
+       depends on MFD_ROHM_BD718XX || MFD_ROHM_BD70528
        help
-         This driver supports ROHM BD71837 and ROHM BD71847
-         PMICs clock gates.
+         This driver supports ROHM BD71837, ROHM BD71847 and
+         ROHM BD70528 PMICs clock gates.
 
 config COMMON_CLK_FIXED_MMIO
        bool "Clock driver for Memory Mapped Fixed values"