Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
2 changes: 1 addition & 1 deletion drivers/dma/dma_stm32_v1.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ uint32_t dma_stm32_id_to_stream(uint32_t id)
return stream_nr[id];
}

#if !defined(CONFIG_DMAMUX_STM32)
#if !defined(CONFIG_SOC_SERIES_STM32H7X) && !defined(CONFIG_SOC_SERIES_STM32MP1X)
Copy link
Member

@erwango erwango Oct 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Non blocking: Then, what about applying the same to dma_stm32_slot_to_channel() declaration in header:

#if !defined(CONFIG_DMAMUX_STM32)
uint32_t dma_stm32_slot_to_channel(uint32_t id);
#endif

[Out of scope of this PR]
This also raises the question on another user of this function: stm32_dma_config_channel_function, also defined under #if !defined(CONFIG_DMAMUX_STM32), but this one is never called, so maybe it could be purely removed ?
@FRASTM can you have a look ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Addressed in next commit! Thanks :)

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah I split the fix commit and the removal of dead code commit.

uint32_t dma_stm32_slot_to_channel(uint32_t slot)
{
static const uint32_t channel_nr[] = {
Expand Down
2 changes: 1 addition & 1 deletion dts/arm/st/l4/stm32l4p5.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@
interrupts = <85 0>;
interrupt-names = "dcmi";
clocks = <&rcc STM32_CLOCK(AHB2, 14)>;
dmas = <&dma1 0 91 (STM32_DMA_PERIPH_TO_MEMORY | STM32_DMA_PERIPH_NO_INC |
dmas = <&dma1 1 91 (STM32_DMA_PERIPH_TO_MEMORY | STM32_DMA_PERIPH_NO_INC |
STM32_DMA_MEM_INC | STM32_DMA_PERIPH_8BITS | STM32_DMA_MEM_32BITS |
STM32_DMA_PRIORITY_HIGH) STM32_DMA_FIFO_1_4>;
status = "disabled";
Expand Down
2 changes: 1 addition & 1 deletion dts/arm/st/l4/stm32l4r5.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
};

dcmi@50050000 {
dmas = <&dma2 0 90 (STM32_DMA_PERIPH_TO_MEMORY | STM32_DMA_PERIPH_NO_INC |
dmas = <&dma1 1 90 (STM32_DMA_PERIPH_TO_MEMORY | STM32_DMA_PERIPH_NO_INC |
STM32_DMA_MEM_INC | STM32_DMA_PERIPH_8BITS | STM32_DMA_MEM_32BITS |
STM32_DMA_PRIORITY_HIGH) STM32_DMA_FIFO_1_4>;
};
Expand Down