diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-03-25 19:46:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-03-25 19:46:19 -0700 |
| commit | 5e0c2cc4c35283e2ae7a0602d1fe85acf8ae6ccc (patch) | |
| tree | b0c77338830031ad21276e0e6c46ec37f115b110 /include | |
| parent | 47618bc875407b54296285e21d92d79889ce503a (diff) | |
| parent | 6df320abbb40654085d7258de33d78481e93ac8d (diff) | |
Merge tag 'pwm/for-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux
Pull pwm updates from Uwe Kleine-König:
"Here comes the usual mix of cleanups, new dt-bindings for existing
drivers and nexus nodes; and a new driver for the pwm subsystem.
Patches were contributed by Andy Shevchenko, Chen Wang, Chukun Pan,
Frank Li, Herve Codina, Kever Yang, and Nam Cao. Patch feedback was
provided by Andy Shevchenko, Conor Dooley, Daniel Mack, Duje
Mihanović, Heiko Stuebner, Herve Codina, Krzysztof Kozlowski, Neil
Armstrong, Rob Herring, and Zack Rusin. Thanks to all of them"
* tag 'pwm/for-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux:
dt-bindings: pwm: imx: Add i.MX93, i.MX94 and i.MX95 support
dt-bindings: pwm: rockchip: Add rockchip,rk3528-pwm
pwm: stmpe: Allow to compile as a module
pwm: Check for CONFIG_PWM using IS_REACHABLE() in main header
dt-bindings: pwm: rockchip: Add rockchip,rk3562-pwm
pwm: Strengthen dependency for PWM_SIFIVE
pwm: clps711x: Drop of_match_ptr() usage for .of_match_table
pwm: pca9685: Drop ACPI_PTR() and of_match_ptr()
pwm: Add support for pwm nexus dt bindings
dt-bindings: pwm: Add support for PWM nexus node
pwm: Add upgrade path to #pwm-cells = <3> for users of of_pwm_single_xlate()
pwm: gpio: Switch to use hrtimer_setup()
pwm: sophgo: add driver for Sophgo SG2042 PWM
dt-bindings: pwm: sophgo: add PWM controller for SG2042
pwm: lpss: Only include <linux/pwm.h> where needed
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pwm.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/pwm.h b/include/linux/pwm.h index a2df509056ac..9ece4e5d3815 100644 --- a/include/linux/pwm.h +++ b/include/linux/pwm.h @@ -379,7 +379,7 @@ static inline void pwmchip_set_drvdata(struct pwm_chip *chip, void *data) dev_set_drvdata(&chip->dev, data); } -#if IS_ENABLED(CONFIG_PWM) +#if IS_REACHABLE(CONFIG_PWM) /* PWM consumer APIs */ int pwm_round_waveform_might_sleep(struct pwm_device *pwm, struct pwm_waveform *wf); @@ -661,7 +661,7 @@ struct pwm_lookup { PWM_LOOKUP_WITH_MODULE(_provider, _index, _dev_id, _con_id, _period, \ _polarity, NULL) -#if IS_ENABLED(CONFIG_PWM) +#if IS_REACHABLE(CONFIG_PWM) void pwm_add_table(struct pwm_lookup *table, size_t num); void pwm_remove_table(struct pwm_lookup *table, size_t num); #else |