---

yaml --- r: 347123 b: refs/heads/master c: 3744c26 h: refs/heads/master i: 347121: ecc82ce 347119: 30cd2ee v: v3
git-mirror · Nov 28, 2012 · a4c9541 · a4c9541
1 parent 22303c5
commit a4c9541
Show file tree

Hide file tree

Showing 5 changed files with 387 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98ccf49daf3bd626196814e38ec8d2460e0d4517
+refs/heads/master: 3744c26386971db1c7ecf5aa5900882deae60492
diff --git a/trunk/Documentation/devicetree/bindings/pwm/ti,twl-pwm.txt b/trunk/Documentation/devicetree/bindings/pwm/ti,twl-pwm.txt
@@ -0,0 +1,17 @@
+Texas Instruments TWL series PWM drivers
+
+Supported PWMs:
+On TWL4030 series: PWM1 and PWM2
+On TWL6030 series: PWM0 and PWM1
+
+Required properties:
+- compatible: "ti,twl4030-pwm" or "ti,twl6030-pwm"
+- #pwm-cells: should be 2.  The first cell specifies the per-chip index
+  of the PWM to use and the second cell is the period in nanoseconds.
+
+Example:
+
+twl_pwm: pwm {
+	compatible = "ti,twl6030-pwm";
+	#pwm-cells = <2>;
+};
diff --git a/trunk/drivers/pwm/Kconfig b/trunk/drivers/pwm/Kconfig
@@ -173,6 +173,15 @@ config PWM_TWL6030
 	  To compile this driver as a module, choose M here: the module
 	  will be called pwm-twl6030.
 
+config PWM_TWL
+	tristate "TWL4030/6030 PWM support"
+	depends on TWL4030_CORE
+	help
+	  Generic PWM framework driver for TWL4030/6030.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called pwm-twl.
+
 config PWM_VT8500
 	tristate "vt8500 pwm support"
 	depends on ARCH_VT8500

diff --git a/trunk/drivers/pwm/Makefile b/trunk/drivers/pwm/Makefile
@@ -14,4 +14,5 @@ obj-$(CONFIG_PWM_TIECAP)	+= pwm-tiecap.o
 obj-$(CONFIG_PWM_TIEHRPWM)	+= pwm-tiehrpwm.o
 obj-$(CONFIG_PWM_TIPWMSS)	+= pwm-tipwmss.o
 obj-$(CONFIG_PWM_TWL6030)	+= pwm-twl6030.o
+obj-$(CONFIG_PWM_TWL)		+= pwm-twl.o
 obj-$(CONFIG_PWM_VT8500)	+= pwm-vt8500.o