diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-12 11:11:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-12 11:11:05 -0700 |
| commit | b67be92feb486f800d80d72c67fd87b47b79b18e (patch) | |
| tree | fcd22ae553cc094be6fcee8f2d3f99661793d165 /include | |
| parent | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux (diff) | |
| parent | Merge branch 'for-4.9/drivers' into for-next (diff) | |
| download | linux-dev-b67be92feb486f800d80d72c67fd87b47b79b18e.tar.xz linux-dev-b67be92feb486f800d80d72c67fd87b47b79b18e.zip | |
Merge tag 'pwm/for-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm
Pull pwm updates from Thierry Reding:
"This set of changes contains support for PWM signal capture in the STi
driver as well as support for the PWM controller found on Meson SoCs.
There's also support added for the MediaTek MT2701 and SunXi H3 to the
existing drivers.
Other than that there's a fair set of miscellaneous cleanups and fixes
across the board"
* tag 'pwm/for-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm: (24 commits)
pwm: meson: Handle unknown ID values
pwm: sti: Take the opportunity to conduct a little house keeping
pwm: sti: It's now valid for number of PWM channels to be zero
pwm: sti: Add PWM capture callback
pwm: sti: Add support for PWM capture interrupts
pwm: sti: Initialise PWM capture device data
pwm: sti: Supply PWM Capture clock handling
pwm: sti: Supply PWM capture register addresses and bit locations
pwm: sti: Only request clock rate when needed
pwm: sti: Reorganise register names in preparation for new functionality
pwm: sti: Rename channel => device
dt-bindings: pwm: sti: Update DT bindings for capture support
pwm: lpc-18xx: use pwm_set_chip_data
pwm: sunxi: Add H3 support
pwm: Add support for Meson PWM Controller
dt-bindings: pwm: Add bindings for Meson PWM Controller
pwm: samsung: Fix to use lowest div for large enough modulation bits
pwm: pwm-tipwmss: Remove all runtime PM gets/puts
pwm: cros-ec: Add __packed to prevent padding
pwm: Add MediaTek MT2701 display PWM driver support
...
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pwm.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/pwm.h b/include/linux/pwm.h index f1bbae014889..2c6c5114c089 100644 --- a/include/linux/pwm.h +++ b/include/linux/pwm.h @@ -641,6 +641,7 @@ static inline void pwm_remove_table(struct pwm_lookup *table, size_t num) #ifdef CONFIG_PWM_SYSFS void pwmchip_sysfs_export(struct pwm_chip *chip); void pwmchip_sysfs_unexport(struct pwm_chip *chip); +void pwmchip_sysfs_unexport_children(struct pwm_chip *chip); #else static inline void pwmchip_sysfs_export(struct pwm_chip *chip) { @@ -649,6 +650,10 @@ static inline void pwmchip_sysfs_export(struct pwm_chip *chip) static inline void pwmchip_sysfs_unexport(struct pwm_chip *chip) { } + +static inline void pwmchip_sysfs_unexport_children(struct pwm_chip *chip) +{ +} #endif /* CONFIG_PWM_SYSFS */ #endif /* __LINUX_PWM_H */ |