Skip to content

[DNM] west.yml: upgrade Zephyr to 8f34181e3dd73fa7 + PR54900 backport #7111

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

Closed
kv2019i wants to merge 3 commits into from
Closed

[DNM] west.yml: upgrade Zephyr to 8f34181e3dd73fa7 + PR54900 backport #7111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
732be89
dai-zephyr: fix state dependent logic in trigger handling
kv2019i Feb 16, 2023
67e6ff4
dai-zephyr: call dma_stop() also if previous state is COMP_STATE_PAUSED
kv2019i Feb 16, 2023
cc5b539
west.yml: upgrade Zephyr to 8f34181e3dd7 + PR54900 backport
kv2019i Feb 1, 2023
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
8 changes: 4 additions & 4 deletions src/audio/dai-zephyr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1014,6 +1014,7 @@ static void dai_update_start_position(struct comp_dev *dev)
static int dai_comp_trigger_internal(struct comp_dev *dev, int cmd)
{
struct dai_data *dd = comp_get_drvdata(dev);
int prev_state = dev->state;
int ret;

comp_dbg(dev, "dai_comp_trigger_internal(), command = %u", cmd);
Expand Down Expand Up @@ -1101,17 +1102,16 @@ static int dai_comp_trigger_internal(struct comp_dev *dev, int cmd)
dai_trigger_op(dd->dai, cmd, dev->direction);
#else
dai_trigger_op(dd->dai, cmd, dev->direction);
if (dev->state == COMP_STATE_ACTIVE) {
ret = dma_stop(dd->chan->dma->z_dev, dd->chan->index);
} else {
ret = dma_stop(dd->chan->dma->z_dev, dd->chan->index);
if (ret) {
comp_warn(dev, "dma was stopped earlier");
ret = 0;
}
#endif
break;
case COMP_TRIGGER_PAUSE:
comp_dbg(dev, "dai_comp_trigger_internal(), PAUSE");
if (dev->state == COMP_STATE_ACTIVE) {
if (prev_state == COMP_STATE_ACTIVE) {
ret = dma_suspend(dd->chan->dma->z_dev, dd->chan->index);
} else {
comp_warn(dev, "dma was stopped earlier");
Expand Down
6 changes: 4 additions & 2 deletions west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ manifest:
url-base: https://github.com/thesofproject
- name: zephyrproject
url-base: https://github.com/zephyrproject-rtos
- name: kvzephyrproject
url-base: https://github.com/kv2019i

# When upgrading projects here please run git log --oneline in the
# project and if not too long then include the output in your commit
Expand Down Expand Up @@ -43,8 +45,8 @@ manifest:

- name: zephyr
repo-path: zephyr
revision: d9c4ec31fc49e7eef3c8c3b0d07827cc04e6efee
remote: zephyrproject
revision: 8f34181e3dd73fa7c1a552be01aa48abbad6ca84
remote: kvzephyrproject
# Import some projects listed in zephyr/west.yml@revision
#
# Warning: changes to zephyr/west.yml or to any other _imported_
Expand Down