Skip to content

driver: i2s: i2s_silabs_siwx91x: Add pm device support for i2s driver #96008

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+61 −16
Open

driver: i2s: i2s_silabs_siwx91x: Add pm device support for i2s driver #96008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
73 changes: 57 additions & 16 deletions drivers/i2s/i2s_silabs_siwx91x.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
#include <zephyr/drivers/clock_control.h>
#include <zephyr/irq.h>
#include <zephyr/sys/util.h>
#include <zephyr/pm/device.h>
#include <zephyr/pm/device_runtime.h>
#include <zephyr/sys/sys_io.h>
#include <zephyr/logging/log.h>
#include "clock_update.h"
Expand Down Expand Up @@ -440,6 +442,9 @@ static void i2s_siwx91x_dma_rx_callback(const struct device *dma_dev, void *user

rx_disable:
i2s_siwx91x_stream_disable(stream, dma_dev);
if (stream->state == I2S_STATE_READY && stream->last_block) {
pm_device_runtime_put_async(i2s_dev, K_NO_WAIT);
}
}

static void i2s_siwx91x_dma_tx_callback(const struct device *dma_dev, void *user_data,
Expand Down Expand Up @@ -506,6 +511,9 @@ static void i2s_siwx91x_dma_tx_callback(const struct device *dma_dev, void *user

tx_disable:
i2s_siwx91x_stream_disable(stream, dma_dev);
if (stream->state == I2S_STATE_READY && stream->last_block) {
pm_device_runtime_put_async(i2s_dev, K_NO_WAIT);
}
}

static int i2s_siwx91x_param_config(const struct device *dev, enum i2s_dir dir)
Expand Down Expand Up @@ -746,19 +754,27 @@ static int i2s_siwx91x_trigger(const struct device *dev, enum i2s_dir dir, enum

switch (cmd) {
case I2S_TRIGGER_START:
ret = pm_device_runtime_get(dev);
if (ret < 0) {
return ret;
}

if (stream->state != I2S_STATE_READY) {
pm_device_runtime_put_async(dev, K_NO_WAIT);
return -EIO;
}

__ASSERT_NO_MSG(stream->mem_block == NULL);

ret = i2s_siwx91x_param_config(dev, dir);
if (ret < 0) {
pm_device_runtime_put_async(dev, K_NO_WAIT);
return ret;
}

ret = i2s_siwx91x_dma_channel_alloc(dev, dir);
if (ret < 0) {
pm_device_runtime_put_async(dev, K_NO_WAIT);
return ret;
}

Expand All @@ -770,6 +786,7 @@ static int i2s_siwx91x_trigger(const struct device *dev, enum i2s_dir dir, enum

ret = stream->stream_start(stream, dev);
if (ret < 0) {
pm_device_runtime_put_async(dev, K_NO_WAIT);
return ret;
}

Expand Down Expand Up @@ -815,6 +832,7 @@ static int i2s_siwx91x_trigger(const struct device *dev, enum i2s_dir dir, enum
i2s_siwx91x_stream_disable(stream, stream->dma_dev);
stream->queue_drop(stream);
stream->state = I2S_STATE_READY;
pm_device_runtime_put_async(dev, K_NO_WAIT);
break;

case I2S_TRIGGER_PREPARE:
Expand All @@ -833,31 +851,53 @@ static int i2s_siwx91x_trigger(const struct device *dev, enum i2s_dir dir, enum
return 0;
}

static int i2s_siwx91x_init(const struct device *dev)
static int i2s_siwx91x_pm_action(const struct device *dev, enum pm_device_action action)
{
const struct i2s_siwx91x_config *cfg = dev->config;
struct i2s_siwx91x_data *data = dev->data;
int ret;

ret = clock_control_on(cfg->clock_dev, cfg->clock_subsys_peripheral);
if (ret) {
return ret;
}
switch (action) {
case PM_DEVICE_ACTION_RESUME:
break;
case PM_DEVICE_ACTION_SUSPEND:
break;
case PM_DEVICE_ACTION_TURN_ON:
ret = clock_control_on(cfg->clock_dev, cfg->clock_subsys_peripheral);
if (ret < 0 && ret != -EALREADY) {
return ret;
}

ret = pinctrl_apply_state(cfg->pcfg, PINCTRL_STATE_DEFAULT);
if (ret) {
return ret;
ret = pinctrl_apply_state(cfg->pcfg, PINCTRL_STATE_DEFAULT);
if (ret < 0 && ret != -ENOENT) {
return ret;
}

cfg->reg->I2S_IER_b.IEN = 1;
cfg->reg->I2S_IRER_b.RXEN = 0;
cfg->reg->I2S_ITER_b.TXEN = 0;
break;
case PM_DEVICE_ACTION_TURN_OFF:
ret = clock_control_off(cfg->clock_dev, cfg->clock_subsys_peripheral);
if (ret < 0 && ret != -EALREADY) {
return ret;
}
break;
default:
return -ENOTSUP;
}

cfg->reg->I2S_IER_b.IEN = 1;
cfg->reg->I2S_IRER_b.RXEN = 0;
cfg->reg->I2S_ITER_b.TXEN = 0;
return 0;
}

static int i2s_siwx91x_init(const struct device *dev)
{
struct i2s_siwx91x_data *data = dev->data;

k_sem_init(&data->rx.sem, 0, CONFIG_I2S_SILABS_SIWX91X_RX_BLOCK_COUNT);
k_sem_init(&data->tx.sem, CONFIG_I2S_SILABS_SIWX91X_TX_BLOCK_COUNT,
CONFIG_I2S_SILABS_SIWX91X_TX_BLOCK_COUNT);

return ret;
return pm_device_driver_init(dev, i2s_siwx91x_pm_action);
}

static DEVICE_API(i2s, i2s_siwx91x_driver_api) = {
Expand Down Expand Up @@ -903,8 +943,9 @@ static DEVICE_API(i2s, i2s_siwx91x_driver_api) = {
.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(inst), \
.channel_group = DT_INST_PROP(inst, silabs_channel_group), \
}; \
\
DEVICE_DT_INST_DEFINE(inst, &i2s_siwx91x_init, NULL, &i2s_data_##inst, &i2s_config_##inst, \
POST_KERNEL, CONFIG_I2S_INIT_PRIORITY, &i2s_siwx91x_driver_api);
PM_DEVICE_DT_INST_DEFINE(inst, i2s_siwx91x_pm_action); \
DEVICE_DT_INST_DEFINE(inst, &i2s_siwx91x_init, PM_DEVICE_DT_INST_GET(inst), \
&i2s_data_##inst, &i2s_config_##inst, POST_KERNEL, \
CONFIG_I2S_INIT_PRIORITY, &i2s_siwx91x_driver_api);

DT_INST_FOREACH_STATUS_OKAY(SIWX91X_I2S_INIT)
4 changes: 4 additions & 0 deletions dts/arm/silabs/siwg917.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,8 @@
silabs,channel-group = <0>;
silabs,max-channel-count = <2>;
clocks = <&clock0 SIWX91X_CLK_I2S0>, <&clock0 SIWX91X_CLK_STATIC_I2S0>;
power-domains = <&siwx91x_soc_pd>;
zephyr,pm-device-runtime-auto;
status = "disabled";
};

Expand All @@ -399,6 +401,8 @@
silabs,max-channel-count = <1>;
clocks = <&clock0 SIWX91X_CLK_ULP_I2S>,
<&clock0 SIWX91X_CLK_STATIC_ULP_I2S>;
power-domains = <&siwx91x_soc_pd>;
zephyr,pm-device-runtime-auto;
status = "disabled";
};

Expand Down