---

yaml --- r: 316607 b: refs/heads/master c: f05259a h: refs/heads/master i: 316605: f97687d 316603: 10c7a41 316599: 8e20c29 316591: 10b6cf8 316575: 5ac7f0e 316543: 097bd31 v: v3
git-mirror · Jul 11, 2012 · 4bcafb1 · 4bcafb1
1 parent baed2f8
commit 4bcafb1
Show file tree

Hide file tree

Showing 5 changed files with 440 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc4cd941c900fda27f0146ab615122426229de73
+refs/heads/master: f05259a6ffa40097b5565f25c3fcf833a9d3ecf5
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
@@ -7577,6 +7577,7 @@ W:	http://opensource.wolfsonmicro.com/content/linux-drivers-wolfson-devices
 S:	Supported
 F:	Documentation/hwmon/wm83??
 F:	arch/arm/mach-s3c64xx/mach-crag6410*
+F:	drivers/clk/clk-wm83*.c
 F:	drivers/leds/leds-wm83*.c
 F:	drivers/hwmon/wm83??-hwmon.c
 F:	drivers/input/misc/wm831x-on.c

diff --git a/trunk/drivers/clk/Kconfig b/trunk/drivers/clk/Kconfig
@@ -34,4 +34,11 @@ config COMMON_CLK_DEBUG
 	  clk_flags, clk_prepare_count, clk_enable_count &
 	  clk_notifier_count.
 
+config COMMON_CLK_WM831X
+	tristate "Clock driver for WM831x/2x PMICs"
+	depends on MFD_WM831X
+	---help---
+          Supports the clocking subsystem of the WM831x/2x series of
+	  PMICs from Wolfson Microlectronics.
+
 endmenu
diff --git a/trunk/drivers/clk/Makefile b/trunk/drivers/clk/Makefile
@@ -5,3 +5,6 @@ obj-$(CONFIG_COMMON_CLK)	+= clk.o clk-fixed-rate.o clk-gate.o \
 # SoCs specific
 obj-$(CONFIG_ARCH_MXS)		+= mxs/
 obj-$(CONFIG_PLAT_SPEAR)	+= spear/
+
+# Chip specific
+obj-$(CONFIG_COMMON_CLK_WM831X) += clk-wm831x.o