diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-23 16:32:38 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-23 16:32:38 -0400 |
| commit | c70c5fb2b96dae0996fb0877d996458d3ca57eda (patch) | |
| tree | fba71d0ec85e49e703b567ff43240d3aec6961cd /include/linux | |
| parent | 44d21c3f3a2ef2f58b18bda64c52c99e723f3f4a (diff) | |
| parent | 361c1066c939a88e3bb59364f47055b2a5fb3fd4 (diff) | |
Merge tag 'pwm/for-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm
Pull pwm updates from Thierry Reding:
"This has a couple of fixes for Atmel, Samsung and Broadcom drivers.
Some preparatory patches for more upcoming Intel work is included as
well"
* tag 'pwm/for-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm:
pwm: lpss: pci: Add support for Broxton platform
pwm: bcm-kona: Don't set polarity in probe
pwm: Add pwmchip_add_with_polarity() API
pwm: atmel: Fix incorrect CDTY value after disabling
pwm: atmel: Fix incorrect CDTY value after enabling
pwm: samsung: Use MODULE_DEVICE_TABLE() to include OF modalias
pwm: Add support to remove registered consumer lookup tables
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/pwm.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/linux/pwm.h b/include/linux/pwm.h index e90628cac8fa..36262d08a9da 100644 --- a/include/linux/pwm.h +++ b/include/linux/pwm.h | |||
| @@ -182,6 +182,8 @@ struct pwm_chip { | |||
| 182 | int pwm_set_chip_data(struct pwm_device *pwm, void *data); | 182 | int pwm_set_chip_data(struct pwm_device *pwm, void *data); |
| 183 | void *pwm_get_chip_data(struct pwm_device *pwm); | 183 | void *pwm_get_chip_data(struct pwm_device *pwm); |
| 184 | 184 | ||
| 185 | int pwmchip_add_with_polarity(struct pwm_chip *chip, | ||
| 186 | enum pwm_polarity polarity); | ||
| 185 | int pwmchip_add(struct pwm_chip *chip); | 187 | int pwmchip_add(struct pwm_chip *chip); |
| 186 | int pwmchip_remove(struct pwm_chip *chip); | 188 | int pwmchip_remove(struct pwm_chip *chip); |
| 187 | struct pwm_device *pwm_request_from_chip(struct pwm_chip *chip, | 189 | struct pwm_device *pwm_request_from_chip(struct pwm_chip *chip, |
| @@ -217,6 +219,11 @@ static inline int pwmchip_add(struct pwm_chip *chip) | |||
| 217 | return -EINVAL; | 219 | return -EINVAL; |
| 218 | } | 220 | } |
| 219 | 221 | ||
| 222 | static inline int pwmchip_add_inversed(struct pwm_chip *chip) | ||
| 223 | { | ||
| 224 | return -EINVAL; | ||
| 225 | } | ||
| 226 | |||
| 220 | static inline int pwmchip_remove(struct pwm_chip *chip) | 227 | static inline int pwmchip_remove(struct pwm_chip *chip) |
| 221 | { | 228 | { |
| 222 | return -EINVAL; | 229 | return -EINVAL; |
| @@ -290,10 +297,15 @@ struct pwm_lookup { | |||
| 290 | 297 | ||
| 291 | #if IS_ENABLED(CONFIG_PWM) | 298 | #if IS_ENABLED(CONFIG_PWM) |
| 292 | void pwm_add_table(struct pwm_lookup *table, size_t num); | 299 | void pwm_add_table(struct pwm_lookup *table, size_t num); |
| 300 | void pwm_remove_table(struct pwm_lookup *table, size_t num); | ||
| 293 | #else | 301 | #else |
| 294 | static inline void pwm_add_table(struct pwm_lookup *table, size_t num) | 302 | static inline void pwm_add_table(struct pwm_lookup *table, size_t num) |
| 295 | { | 303 | { |
| 296 | } | 304 | } |
| 305 | |||
| 306 | static inline void pwm_remove_table(struct pwm_lookup *table, size_t num) | ||
| 307 | { | ||
| 308 | } | ||
| 297 | #endif | 309 | #endif |
| 298 | 310 | ||
| 299 | #ifdef CONFIG_PWM_SYSFS | 311 | #ifdef CONFIG_PWM_SYSFS |
