Skip to content

drivers: mspi: stm32_*: save base address in device configuration #108507

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
mathieuchopstm wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −6
Open

drivers: mspi: stm32_*: save base address in device configuration #108507

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
4 changes: 2 additions & 2 deletions drivers/mspi/mspi_stm32.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,13 @@ struct mspi_stm32_context {
};

struct mspi_stm32_conf {
bool dma_specified;
void *base;
size_t pclk_len;
irq_config_func_t irq_config;
struct mspi_cfg mspicfg;
const struct stm32_pclken *pclken;
const struct pinctrl_dev_config *pcfg;
bool dma_specified;
};

struct stm32_stream {
Expand Down Expand Up @@ -82,7 +83,6 @@ union mspi_stm32_handle {
/* mspi data includes the controller specific config variable */
struct mspi_stm32_data {
union mspi_stm32_handle hmspi;
uintptr_t phys_addr;
uint32_t memmap_base_addr;
struct mspi_stm32_context ctx;
const struct mspi_dev_id *dev_id;
Expand Down
4 changes: 2 additions & 2 deletions drivers/mspi/mspi_stm32_ospi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1118,7 +1118,7 @@ static int mspi_stm32_ospi_config(const struct mspi_dt_spec *spec)
return ret;
}

dev_data->hmspi.ospi.Instance = (XSPI_TypeDef *)dev_data->phys_addr;
dev_data->hmspi.ospi.Instance = dev_cfg->base;
(void)pm_device_runtime_get(spec->bus);
/* Prevent the clocks to be stopped during the request */
pm_policy_state_lock_get(PM_STATE_SUSPEND_TO_IDLE, PM_ALL_SUBSTATES);
Expand Down Expand Up @@ -1401,6 +1401,7 @@ static int mspi_stm32_ospi_pm_action(const struct device *dev, enum pm_device_ac
STM32_SMPI_IRQ_HANDLER(index) \
\
static const struct mspi_stm32_conf mspi_stm32_dev_conf_##index = { \
.base = (void *)DT_INST_REG_ADDR(index), \
.pclken = pclken_##index, \
.pclk_len = DT_INST_NUM_CLOCKS(index), \
.irq_config = mspi_stm32_irq_config_func_##index, \
Expand All @@ -1410,7 +1411,6 @@ static int mspi_stm32_ospi_pm_action(const struct device *dev, enum pm_device_ac
.dma_specified = DT_INST_NODE_HAS_PROP(index, dmas), \
}; \
static struct mspi_stm32_data mspi_stm32_dev_data_##index = { \
.phys_addr = DT_INST_REG_ADDR(index), \
.hmspi.ospi = { \
Copy link
Copy Markdown
Contributor

@etienne-lms etienne-lms May 5, 2026

Choose a reason for hiding this comment

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

I think you could set the base address straight here:

 	static struct mspi_stm32_data mspi_stm32_dev_data_##index = {                              \
-		.phys_addr = DT_INST_REG_ADDR(index),                                              \
		.hmspi.ospi = {                                                                    \
+			.Instance = (void *)DT_INST_REG_ADDR(index),                               \
 			.Init = {                                                                  \

Ditto in mspi_stm32_xspi.c driver.

.Init = { \
.FifoThreshold = MSPI_STM32_FIFO_THRESHOLD, \
Expand Down
4 changes: 2 additions & 2 deletions drivers/mspi/mspi_stm32_xspi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1252,7 +1252,7 @@ static int mspi_stm32_xspi_config(const struct mspi_dt_spec *spec)
return ret;
}

dev_data->hmspi.xspi.Instance = (XSPI_TypeDef *)dev_data->phys_addr;
dev_data->hmspi.xspi.Instance = dev_cfg->base;
(void)pm_device_runtime_get(spec->bus);
/* Prevent the clocks to be stopped during the request */
pm_policy_state_lock_get(PM_STATE_SUSPEND_TO_IDLE, PM_ALL_SUBSTATES);
Expand Down Expand Up @@ -1472,6 +1472,7 @@ static int mspi_stm32_xspi_pm_action(const struct device *dev, enum pm_device_ac
STM32_SMPI_IRQ_HANDLER(index) \
\
static const struct mspi_stm32_conf mspi_stm32_dev_conf_##index = { \
.base = (void *)DT_INST_REG_ADDR(index), \
.pclken = pclken_##index, \
.pclk_len = DT_INST_NUM_CLOCKS(index), \
.irq_config = mspi_stm32_irq_config_func_##index, \
Expand All @@ -1481,7 +1482,6 @@ static int mspi_stm32_xspi_pm_action(const struct device *dev, enum pm_device_ac
.dma_specified = DT_INST_NODE_HAS_PROP(index, dmas), \
}; \
static struct mspi_stm32_data mspi_stm32_dev_data_##index = { \
.phys_addr = DT_INST_REG_ADDR(index), \
.hmspi.xspi = { \
.Init = { \
.FifoThresholdByte = MSPI_STM32_FIFO_THRESHOLD, \
Expand Down
Loading