Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Feature][OPL-9809] Setting PWM channel at device init #69

Merged
merged 2 commits into from
Jan 16, 2024
Merged

[Feature][OPL-9809] Setting PWM channel at device init #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c74f62
pwm: Set timing in DTS
JvanDooren Jan 11, 2024
9759412
OPL-9809 Rework after code review
JvanDooren Jan 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 52 additions & 2 deletions drivers/pwm/pwm_stm32.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include <stm32_ll_tim.h>
#include <zephyr/drivers/pwm.h>
#include <zephyr/drivers/pinctrl.h>
#include <zephyr/drivers/reset.h>
#include <zephyr/device.h>
#include <zephyr/kernel.h>
#include <zephyr/init.h>
Expand Down Expand Up @@ -77,11 +78,28 @@
struct pwm_stm32_data {
/** Timer clock (Hz). */
uint32_t tim_clk;
/* Reset controller device configuration */
const struct reset_dt_spec reset;
#ifdef CONFIG_PWM_CAPTURE
struct pwm_stm32_capture_data capture;
#endif /* CONFIG_PWM_CAPTURE */
};

#define TIMING_NR_CELLS 4

/**
* @brief structure to convey optional pwm channel timings settings
*/
struct pwm_config_channel_timing {
uint32_t channel;
/* pwm period in nanoseconds */
uint32_t period_ns;
/* pwm pulse in nanoseconds */
uint32_t pulse_ns;
/* flags in 16 bit value*/
pwm_flags_t flags;
};

/** PWM configuration. */
struct pwm_stm32_config {
TIM_TypeDef *timer;
Expand All @@ -93,6 +111,8 @@
void (*irq_config_func)(const struct device *dev);
const bool four_channel_capture_support;
#endif /* CONFIG_PWM_CAPTURE */
const struct pwm_config_channel_timing *timings;
size_t n_timings;
};

/** Maximum number of timer channels : some stm32 soc have 6 else only 4 */
Expand Down Expand Up @@ -760,6 +780,7 @@
const struct pwm_stm32_config *cfg = dev->config;

int r;
int i;
const struct device *clk;
LL_TIM_InitTypeDef init;

Expand All @@ -783,6 +804,9 @@
return r;
}

/* Reset timer to default state using RCC */
(void)reset_line_toggle_dt(&data->reset);

/* configure pinmux */
r = pinctrl_apply_state(cfg->pcfg, PINCTRL_STATE_DEFAULT);
if (r < 0) {
Expand Down Expand Up @@ -816,6 +840,18 @@
cfg->irq_config_func(dev);
#endif /* CONFIG_PWM_CAPTURE */

/* set optional timing value for channels */
for (i = 0; i < cfg->n_timings; i++) {
const struct pwm_config_channel_timing *preset = &cfg->timings[i];
r = pwm_set(dev, preset->channel, preset->period_ns,

Check warning on line 846 in drivers/pwm/pwm_stm32.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

LINE_SPACING 

drivers/pwm/pwm_stm32.c:846  Missing a blank line after declarations
preset->pulse_ns, preset->flags);
if (r < 0) {
LOG_ERR("PWM timing setup on channel %d failed (%d)",
preset->channel, r);
return r;
}
}

return 0;
}

Expand All @@ -830,22 +866,35 @@
}
#define CAPTURE_INIT(index) \
.irq_config_func = pwm_stm32_irq_config_func_##index, \
.four_channel_capture_support = DT_INST_PROP(index, four_channel_capture_support)
.four_channel_capture_support = DT_INST_PROP(index, four_channel_capture_support),
#else
#define IRQ_CONFIG_FUNC(index)
#define CAPTURE_INIT(index)
#endif /* CONFIG_PWM_CAPTURE */

#define DEFINE_TIMINGS(index) \
static const uint32_t pwm_channel_timings_##index[] = \
DT_INST_PROP_OR(index, timings, {});

#define USE_TIMINGS(index) \
JvanDooren marked this conversation as resolved.
Show resolved Hide resolved
.timings = (const struct pwm_config_channel_timing *) pwm_channel_timings_##index, \
.n_timings = ARRAY_SIZE(pwm_channel_timings_##index)/TIMING_NR_CELLS,

#define DT_INST_CLK(index, inst) \
{ \
.bus = DT_CLOCKS_CELL(DT_INST_PARENT(index), bus), \
.enr = DT_CLOCKS_CELL(DT_INST_PARENT(index), bits) \
}

#define PWM_DEVICE_INIT(index) \
static struct pwm_stm32_data pwm_stm32_data_##index; \
static struct pwm_stm32_data pwm_stm32_data_##index = { \
.reset = RESET_DT_SPEC_GET(DT_INST_PARENT(index)), \
}; \
\
IRQ_CONFIG_FUNC(index) \
\
DEFINE_TIMINGS(index) \
\
PINCTRL_DT_INST_DEFINE(index); \
\
static const struct pwm_stm32_config pwm_stm32_config_##index = { \
Expand All @@ -855,6 +904,7 @@
.pclken = DT_INST_CLK(index, timer), \
.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(index), \
CAPTURE_INIT(index) \
USE_TIMINGS(index) \
}; \
\
DEVICE_DT_INST_DEFINE(index, &pwm_stm32_init, NULL, \
Expand Down
9 changes: 9 additions & 0 deletions dts/bindings/pwm/st,stm32-pwm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,15 @@ properties:
pinctrl-names:
required: true

timings:
required: false
type: array
description: |
defines the pwm values per channel defined in pinctrl-0
set during driver init
<1 /*channel*/ PWM_USEC(10000) /*period*/ PWM_USEC(5000) /*pulse*/ 0 /*flags*/>,
<2 /*channel*/ PWM_USEC(10000) /*period*/ PWM_USEC(5000) /*pulse*/ 0 /*flags*/>;

four-channel-capture-support:
type: boolean
description: |
Expand Down
Loading