Skip to content

Commit acebb41

Browse files
mertekrenttmut
authored andcommitted
drivers: spi: MAX32657 fix related to register name change
MAX32657 introduces changes for registers named (master, slave) to (controller, target) this causes build issues Signed-off-by: Mert Ekren <mert.ekren@analog.com>
1 parent 21bda08 commit acebb41

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

drivers/spi/spi_max32.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ static int transceive(const struct device *dev, const struct spi_config *config,
393393
spi_context_cs_control(ctx, true);
394394
} else {
395395
cfg->regs->ctrl0 =
396-
(cfg->regs->ctrl0 & ~MXC_F_SPI_CTRL0_START) | MXC_F_SPI_CTRL0_SS_CTRL;
396+
(cfg->regs->ctrl0 & ~MXC_F_SPI_CTRL0_START) | ADI_MAX32_SPI_CTRL0_SS_CTRL;
397397
}
398398

399399
#ifdef CONFIG_SPI_MAX32_INTERRUPT
@@ -423,7 +423,7 @@ static int transceive(const struct device *dev, const struct spi_config *config,
423423
if (!hw_cs_ctrl) {
424424
spi_context_cs_control(ctx, false);
425425
} else {
426-
cfg->regs->ctrl0 &= ~(MXC_F_SPI_CTRL0_START | MXC_F_SPI_CTRL0_SS_CTRL |
426+
cfg->regs->ctrl0 &= ~(MXC_F_SPI_CTRL0_START | ADI_MAX32_SPI_CTRL0_SS_CTRL |
427427
ADI_MAX32_SPI_CTRL_EN);
428428
cfg->regs->ctrl0 |= ADI_MAX32_SPI_CTRL_EN;
429429
}
@@ -589,7 +589,7 @@ static int transceive_dma(const struct device *dev, const struct spi_config *con
589589
if (!hw_cs_ctrl) {
590590
spi_context_cs_control(ctx, true);
591591
} else {
592-
spi->ctrl0 = (spi->ctrl0 & ~MXC_F_SPI_CTRL0_START) | MXC_F_SPI_CTRL0_SS_CTRL;
592+
spi->ctrl0 = (spi->ctrl0 & ~MXC_F_SPI_CTRL0_START) | ADI_MAX32_SPI_CTRL0_SS_CTRL;
593593
}
594594

595595
MXC_SPI_SetSlave(cfg->regs, ctx->config->slave);
@@ -643,7 +643,7 @@ static int transceive_dma(const struct device *dev, const struct spi_config *con
643643
if (!hw_cs_ctrl) {
644644
spi_context_cs_control(ctx, false);
645645
} else {
646-
spi->ctrl0 &= ~(MXC_F_SPI_CTRL0_START | MXC_F_SPI_CTRL0_SS_CTRL |
646+
spi->ctrl0 &= ~(MXC_F_SPI_CTRL0_START | ADI_MAX32_SPI_CTRL0_SS_CTRL |
647647
ADI_MAX32_SPI_CTRL_EN);
648648
spi->ctrl0 |= ADI_MAX32_SPI_CTRL_EN;
649649
}
@@ -797,7 +797,7 @@ static void spi_max32_callback(mxc_spi_req_t *req, int error)
797797
if (spi_cs_is_gpio(ctx->config)) {
798798
spi_context_cs_control(ctx, false);
799799
} else {
800-
req->spi->ctrl0 &= ~(MXC_F_SPI_CTRL0_START | MXC_F_SPI_CTRL0_SS_CTRL |
800+
req->spi->ctrl0 &= ~(MXC_F_SPI_CTRL0_START | ADI_MAX32_SPI_CTRL0_SS_CTRL |
801801
ADI_MAX32_SPI_CTRL_EN);
802802
req->spi->ctrl0 |= ADI_MAX32_SPI_CTRL_EN;
803803
}

0 commit comments

Comments
 (0)