michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: pwm_nrfx: Treat pwm parameter as PWM channel, not SoC pin

Browse source 
Align with other PWM drivers and treat the `pwm` parameter (described
ambiguously as "PWM pin") of the `pwm_pin_set_cycles` function as a PWM
channel, not an SoC pin. This will also make the driver consistent with
the `pwm-cells` property definition in the "nordic,nrf-pwm" binding
and with related `DT_PWMS_*` macros.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
This commit is contained in:
Andrzej Głąbek 2022-04-13 11:44:36 +02:00 • committed by Carles Cufí
commit dbdbc79b36
1 changed files with 9 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

38
drivers/pwm/pwm_nrfx.c
View file

@ -89,22 +89,6 @@ static int pwm_period_check_and_set(const struct pwm_nrfx_config *config,
return -EINVAL; return -EINVAL;
} }
static uint8_t pwm_channel_map(const struct pwm_nrfx_config *config,
uint32_t pwm)
{
uint8_t i;
/* Find pin, return channel number */
for (i = 0U; i < NRF_PWM_CHANNEL_COUNT; i++) {
if (nrf_pwm_pin_get(config->pwm.p_registers, i) == pwm) {
return i;
}
}
/* Return NRF_PWM_CHANNEL_COUNT to show that PWM pin was not found. */
return NRF_PWM_CHANNEL_COUNT;
}
static bool pwm_channel_is_active(uint8_t channel, static bool pwm_channel_is_active(uint8_t channel,
const struct pwm_nrfx_data *data) const struct pwm_nrfx_data *data)
{ {
@ -139,7 +123,7 @@ static int pwm_nrfx_pin_set(const struct device *dev, uint32_t pwm,
*/ */
const struct pwm_nrfx_config *config = dev->config; const struct pwm_nrfx_config *config = dev->config;
struct pwm_nrfx_data *data = dev->data; struct pwm_nrfx_data *data = dev->data;
uint8_t channel; uint8_t channel = pwm;
bool was_stopped; bool was_stopped;
if (flags) { if (flags) {
@ -147,14 +131,8 @@ static int pwm_nrfx_pin_set(const struct device *dev, uint32_t pwm,
return -ENOTSUP; return -ENOTSUP;
} }
/* Check if PWM pin is one of the predefined DTS config pins. if (channel >= NRF_PWM_CHANNEL_COUNT) {
* Return its array index (channel number), LOG_ERR("Invalid channel: %u.", channel);
* or NRF_PWM_CHANNEL_COUNT if not initialized through DTS.
*/
channel = pwm_channel_map(config, pwm);
if (channel == NRF_PWM_CHANNEL_COUNT) {
LOG_ERR("PWM pin %d not enabled through DTS configuration.",
pwm);
return -EINVAL; return -EINVAL;
} }
@ -194,8 +172,8 @@ static int pwm_nrfx_pin_set(const struct device *dev, uint32_t pwm,
(data->current[channel] & PWM_NRFX_CH_POLARITY_MASK) (data->current[channel] & PWM_NRFX_CH_POLARITY_MASK)
| (pulse_cycles >> data->prescaler)); | (pulse_cycles >> data->prescaler));
LOG_DBG("pin %u, pulse %u, period %u, prescaler: %u.", LOG_DBG("channel %u, pulse %u, period %u, prescaler: %u.",
pwm, pulse_cycles, period_cycles, data->prescaler); channel, pulse_cycles, period_cycles, data->prescaler);
/* If this channel turns out to not need to be driven by the PWM /* If this channel turns out to not need to be driven by the PWM
* peripheral (it is off or fully on - duty 0% or 100%), set properly * peripheral (it is off or fully on - duty 0% or 100%), set properly
@ -218,11 +196,13 @@ static int pwm_nrfx_pin_set(const struct device *dev, uint32_t pwm,
bool pulse_100_and_inverted = bool pulse_100_and_inverted =
(pulse_cycles == period_cycles) (pulse_cycles == period_cycles)
&& channel_inverted_state; && channel_inverted_state;
uint32_t psel =
nrf_pwm_pin_get(config->pwm.p_registers, channel);
if (pulse_0_and_not_inverted || pulse_100_and_inverted) { if (pulse_0_and_not_inverted || pulse_100_and_inverted) {
nrf_gpio_pin_clear(pwm); nrf_gpio_pin_clear(psel);
} else { } else {
nrf_gpio_pin_set(pwm); nrf_gpio_pin_set(psel);
} }
if (!any_other_channel_is_active(channel, data)) { if (!any_other_channel_is_active(channel, data)) {