michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: pwm: Restore default on re-initialization

Browse source 
Device data is cleared on deinitialization. This operation removes
some important information. Let's restore the defaults each time
the device is initialized.

Signed-off-by: Pawel Dunaj <pawel.dunaj@nordicsemi.no>
This commit is contained in:
Pawel Dunaj 2021-09-16 17:55:16 +02:00 • committed by Carles Cufí
commit 7ba38d8b26
1 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

21
drivers/pwm/pwm_nrfx.c
View file

@ -271,6 +271,14 @@ static const struct pwm_driver_api pwm_nrfx_drv_api_funcs = {
static int pwm_nrfx_init(const struct device *dev) static int pwm_nrfx_init(const struct device *dev)
{ {
const struct pwm_nrfx_config *config = dev->config; const struct pwm_nrfx_config *config = dev->config;
struct pwm_nrfx_data *data = dev->data;
for (size_t i = 0; i < ARRAY_SIZE(data->current); i++) {
bool inverted = config->initial_config.output_pins[i] & NRFX_PWM_PIN_INVERTED;
uint16_t value = (inverted)?(PWM_NRFX_CH_VALUE_INVERTED):(PWM_NRFX_CH_VALUE_NORMAL);
data->current[i] = value;
};
nrfx_err_t result = nrfx_pwm_init(&config->pwm, nrfx_err_t result = nrfx_pwm_init(&config->pwm,
&config->initial_config, &config->initial_config,
@ -333,23 +341,12 @@ static int pwm_nrfx_pm_action(const struct device *dev,
(PWM_NRFX_CH_PIN(dev_idx, ch_idx) | \ (PWM_NRFX_CH_PIN(dev_idx, ch_idx) | \
(PWM_NRFX_IS_INVERTED(dev_idx, ch_idx) ? NRFX_PWM_PIN_INVERTED : 0)) (PWM_NRFX_IS_INVERTED(dev_idx, ch_idx) ? NRFX_PWM_PIN_INVERTED : 0))
#define PWM_NRFX_DEFAULT_VALUE(dev_idx, ch_idx) \
(PWM_NRFX_IS_INVERTED(dev_idx, ch_idx) ? \
PWM_NRFX_CH_VALUE_INVERTED : PWM_NRFX_CH_VALUE_NORMAL)
#define PWM_NRFX_COUNT_MODE(dev_idx) \ #define PWM_NRFX_COUNT_MODE(dev_idx) \
(PWM_PROP(dev_idx, center_aligned) ? \ (PWM_PROP(dev_idx, center_aligned) ? \
NRF_PWM_MODE_UP_AND_DOWN : NRF_PWM_MODE_UP) NRF_PWM_MODE_UP_AND_DOWN : NRF_PWM_MODE_UP)
#define PWM_NRFX_DEVICE(idx) \ #define PWM_NRFX_DEVICE(idx) \
static struct pwm_nrfx_data pwm_nrfx_##idx##_data = { \ static struct pwm_nrfx_data pwm_nrfx_##idx##_data; \
.current = { \
PWM_NRFX_DEFAULT_VALUE(idx, 0), \
PWM_NRFX_DEFAULT_VALUE(idx, 1), \
PWM_NRFX_DEFAULT_VALUE(idx, 2), \
PWM_NRFX_DEFAULT_VALUE(idx, 3), \
} \
}; \
static const struct pwm_nrfx_config pwm_nrfx_##idx##config = { \ static const struct pwm_nrfx_config pwm_nrfx_##idx##config = { \
.pwm = NRFX_PWM_INSTANCE(idx), \ .pwm = NRFX_PWM_INSTANCE(idx), \
.initial_config = { \ .initial_config = { \