Merge Linus' tree to be be to apply submitted patches to newer code than

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

diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
index 01abbbe..3f44f29 100644 (file)
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@ -32,12 +32,32 @@ config COMMON_CLK_WM831X
 
 source "drivers/clk/versatile/Kconfig"
 
+config COMMON_CLK_MAX_GEN
+        bool
+
 config COMMON_CLK_MAX77686
        tristate "Clock driver for Maxim 77686 MFD"
        depends on MFD_MAX77686
+       select COMMON_CLK_MAX_GEN
        ---help---
          This driver supports Maxim 77686 crystal oscillator clock. 
 
+config COMMON_CLK_MAX77802
+       tristate "Clock driver for Maxim 77802 PMIC"
+       depends on MFD_MAX77686
+       select COMMON_CLK_MAX_GEN
+       ---help---
+         This driver supports Maxim 77802 crystal oscillator clock.
+
+config COMMON_CLK_RK808
+       tristate "Clock driver for RK808"
+       depends on MFD_RK808
+       ---help---
+         This driver supports RK808 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_SI5351
        tristate "Clock driver for SiLabs 5351A/B/C"
        depends on I2C
@@ -109,6 +129,11 @@ config COMMON_CLK_PALMAS
          This driver supports TI Palmas devices 32KHz output KG and KG_AUDIO
          using common clock framework.
 
+config COMMON_CLK_PXA
+       def_bool COMMON_CLK && ARCH_PXA
+       ---help---
+         Sypport for the Marvell PXA SoC.
+
 source "drivers/clk/qcom/Kconfig"
 
 endmenu