diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-03 21:15:23 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-03 21:15:23 -0700 |
commit | 458c3f60ef12996d5a5b390260a5112bb1da1615 (patch) | |
tree | b75d1a784bcd78291bd66b37d8ea8fa3d1a706e9 /Documentation/devicetree/bindings/pwm/pwm-samsung.txt | |
parent | f83b0a4e4c33aa31dac0b8b48f1f3a470edc933a (diff) | |
parent | 1e185c7aafbb56580feaa5bdbc9e4b1d8efaf710 (diff) | |
download | op-kernel-dev-458c3f60ef12996d5a5b390260a5112bb1da1615.zip op-kernel-dev-458c3f60ef12996d5a5b390260a5112bb1da1615.tar.gz |
Merge tag 'for-3.12-rc1' of git://gitorious.org/linux-pwm/linux-pwm
Pull pwm changes from Thierry Reding:
"A set of patches makes the device tree documentation for the various
PWM drivers more consistent. Device tree support is added to the
Renesas TPU driver. The sysfs interface now makes use of dev_groups.
Other than that there is a healthy assortment of fixes and
enhancements for minor issues that have shown up"
* tag 'for-3.12-rc1' of git://gitorious.org/linux-pwm/linux-pwm:
pwm: pxa: Use module_platform_driver
pwm: tiehrpwm: add missing __iomem annotation
pwm: tiecap: add CONFIG_PM_SLEEP to ecap_pwm_{save,restore}_context()
pwm: simplify use of devm_ioremap_resource
pwm: renesas-tpu: Add DT support
ARM: dts: Use the PWM polarity flags
pwm: Update DT bindings to reference pwm.txt for cells documentation
pwm: Use the DT macro directly when parsing PWM DT flags
pwm: Add PWM polarity flag macro for DT
pwm: mxs: Check the return value from stmp_reset_block()
pwm: convert class code to use dev_groups
Diffstat (limited to 'Documentation/devicetree/bindings/pwm/pwm-samsung.txt')
-rw-r--r-- | Documentation/devicetree/bindings/pwm/pwm-samsung.txt | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/Documentation/devicetree/bindings/pwm/pwm-samsung.txt b/Documentation/devicetree/bindings/pwm/pwm-samsung.txt index ac67c68..4caa1a7 100644 --- a/Documentation/devicetree/bindings/pwm/pwm-samsung.txt +++ b/Documentation/devicetree/bindings/pwm/pwm-samsung.txt @@ -19,13 +19,9 @@ Required properties: - reg: base address and size of register area - interrupts: list of timer interrupts (one interrupt per timer, starting at timer 0) -- #pwm-cells: number of cells used for PWM specifier - must be 3 - the specifier format is as follows: - - phandle to PWM controller node - - index of PWM channel (from 0 to 4) - - PWM signal period in nanoseconds - - bitmask of optional PWM flags: - 0x1 - invert PWM signal +- #pwm-cells: should be 3. See pwm.txt in this directory for a description of + the cells format. The only third cell flag supported by this binding is + PWM_POLARITY_INVERTED. Optional properties: - samsung,pwm-outputs: list of PWM channels used as PWM outputs on particular |