michaelh/zephyr
1
0
Fork 0
Code Releases Activity

dts: bindings: pwm custom macro for STM32 vendor

Browse source 
Change the name of the custom macro defined for the stm32 devices
to fit the VND_PWM_xxx model
Keeping old deprecated macro, though.

Signed-off-by: Francois Ramu <francois.ramu@st.com>
This commit is contained in:
Francois Ramu 2023-01-04 16:30:00 +01:00 • committed by Carles Cufí
commit 210e0b76bf
3 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
drivers/pwm/pwm_stm32.c
View file

@ -271,7 +271,7 @@ static int pwm_stm32_set_cycles(const struct device *dev, uint32_t channel,
/* in LL_TIM_CC_DisableChannel and LL_TIM_CC_IsEnabledChannel, /* in LL_TIM_CC_DisableChannel and LL_TIM_CC_IsEnabledChannel,
* the channel param could be the complementary one * the channel param could be the complementary one
*/ */
if ((flags & PWM_STM32_COMPLEMENTARY_MASK) == PWM_STM32_COMPLEMENTARY) { if ((flags & STM32_PWM_COMPLEMENTARY_MASK) == STM32_PWM_COMPLEMENTARY) {
if (channel > ARRAY_SIZE(ch2ll_n)) { if (channel > ARRAY_SIZE(ch2ll_n)) {
/* setting a flag on a channel that has not this capability */ /* setting a flag on a channel that has not this capability */
LOG_ERR("Channel %d has NO complementary output", channel); LOG_ERR("Channel %d has NO complementary output", channel);
@ -310,8 +310,8 @@ static int pwm_stm32_set_cycles(const struct device *dev, uint32_t channel,
oc_init.OCMode = LL_TIM_OCMODE_PWM1; oc_init.OCMode = LL_TIM_OCMODE_PWM1;
#if defined(LL_TIM_CHANNEL_CH1N) #if defined(LL_TIM_CHANNEL_CH1N)
/* the flags holds the PWM_STM32_COMPLEMENTARY information */ /* the flags holds the STM32_PWM_COMPLEMENTARY information */
if ((flags & PWM_STM32_COMPLEMENTARY_MASK) == PWM_STM32_COMPLEMENTARY) { if ((flags & STM32_PWM_COMPLEMENTARY_MASK) == STM32_PWM_COMPLEMENTARY) {
oc_init.OCNState = LL_TIM_OCSTATE_ENABLE; oc_init.OCNState = LL_TIM_OCSTATE_ENABLE;
oc_init.OCNPolarity = get_polarity(flags); oc_init.OCNPolarity = get_polarity(flags);
} else { } else {

4
dts/bindings/pwm/st,stm32-pwm.yaml
View file

@ -18,8 +18,8 @@ properties:
- channel of the timer used for PWM - channel of the timer used for PWM
- period to set in ns - period to set in ns
- flags : combination of standard flags like PWM_POLARITY_NORMAL - flags : combination of standard flags like PWM_POLARITY_NORMAL
or specific flags like PWM_STM32_COMPLEMENTARY. As an example for channel2: or specific flags like STM32_PWM_COMPLEMENTARY. As an example for channel2:
<&pwm1 2 100 (PWM_POLARITY_NORMAL | PWM_STM32_COMPLEMENTARY)>; <&pwm1 2 100 (PWM_POLARITY_NORMAL | STM32_PWM_COMPLEMENTARY)>;
pwm-cells: pwm-cells:
- channel - channel

10
include/zephyr/dt-bindings/pwm/stm32_pwm.h
View file

@ -3,8 +3,8 @@
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_PWM_STM32_H_ #ifndef ZEPHYR_INCLUDE_DT_BINDINGS_STM32_PWM_H_
#define ZEPHYR_INCLUDE_DT_BINDINGS_PWM_STM32_H_ #define ZEPHYR_INCLUDE_DT_BINDINGS_STM32_PWM_H_
/** /**
* @name custom PWM complementary flags for output pins * @name custom PWM complementary flags for output pins
@ -16,10 +16,14 @@
* @{ * @{
*/ */
/** PWM complementary output pin is enabled */ /** PWM complementary output pin is enabled */
#define STM32_PWM_COMPLEMENTARY (1U << 8)
/**
* @deprecated Use the PWM complementary `STM32_PWM_COMPLEMENTARY` flag instead.
*/
#define PWM_STM32_COMPLEMENTARY (1U << 8) #define PWM_STM32_COMPLEMENTARY (1U << 8)
/** @cond INTERNAL_HIDDEN */ /** @cond INTERNAL_HIDDEN */
#define PWM_STM32_COMPLEMENTARY_MASK 0x100 #define STM32_PWM_COMPLEMENTARY_MASK 0x100
/** @endcond */ /** @endcond */
/** @} */ /** @} */