diff --git a/arch/arm/soc/nxp_kinetis/k6x/Kconfig.defconfig.mk64f12 b/arch/arm/soc/nxp_kinetis/k6x/Kconfig.defconfig.mk64f12 index 7978ff40c8e..a79e81557d6 100644 --- a/arch/arm/soc/nxp_kinetis/k6x/Kconfig.defconfig.mk64f12 +++ b/arch/arm/soc/nxp_kinetis/k6x/Kconfig.defconfig.mk64f12 @@ -48,7 +48,7 @@ config SPI if SPI -config SPI_MCUX +config SPI_MCUX_DSPI def_bool y endif # SPI diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index 1c5f2d94efc..3dca2fdea7c 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -263,6 +263,6 @@ config SPI_SS_1_CS_GPIO_PIN source "drivers/spi/Kconfig.dw" -source "drivers/spi/Kconfig.mcux" +source "drivers/spi/Kconfig.mcux_dspi" endif # SPI diff --git a/drivers/spi/Kconfig.mcux b/drivers/spi/Kconfig.mcux_dspi similarity index 92% rename from drivers/spi/Kconfig.mcux rename to drivers/spi/Kconfig.mcux_dspi index 6a01f0c7a90..c6e3be77bb8 100644 --- a/drivers/spi/Kconfig.mcux +++ b/drivers/spi/Kconfig.mcux_dspi @@ -6,7 +6,7 @@ # SPDX-License-Identifier: Apache-2.0 # -menuconfig SPI_MCUX +menuconfig SPI_MCUX_DSPI bool prompt "MCUX SPI driver" depends on SPI && HAS_MCUX @@ -14,7 +14,7 @@ menuconfig SPI_MCUX help Enable support for mcux spi driver. -if SPI_MCUX +if SPI_MCUX_DSPI config SPI_MCUX_BUF_SIZE int "Number of bytes in the local buffer" @@ -33,4 +33,4 @@ config SPI_MCUX_DUMMY_CHAR This option configures what value to send when the tx buffer length is less than the rx buffer length. -endif # SPI_MCUX +endif # SPI_MCUX_DSPI diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile index e346406a978..650521bc5a9 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile @@ -1,5 +1,5 @@ obj-$(CONFIG_SPI_INTEL) += spi_intel.o obj-$(CONFIG_SPI_DW) += spi_dw.o -obj-$(CONFIG_SPI_MCUX) += spi_mcux.o +obj-$(CONFIG_SPI_MCUX_DSPI) += spi_mcux_dspi.o obj-$(CONFIG_SPI_QMSI) += spi_qmsi.o obj-$(CONFIG_SPI_QMSI_SS) += spi_qmsi_ss.o diff --git a/drivers/spi/spi_mcux.c b/drivers/spi/spi_mcux_dspi.c similarity index 100% rename from drivers/spi/spi_mcux.c rename to drivers/spi/spi_mcux_dspi.c diff --git a/ext/hal/nxp/mcux/drivers/Makefile b/ext/hal/nxp/mcux/drivers/Makefile index 4a6d46b626d..b6f07931ee1 100644 --- a/ext/hal/nxp/mcux/drivers/Makefile +++ b/ext/hal/nxp/mcux/drivers/Makefile @@ -9,6 +9,6 @@ obj-$(CONFIG_I2C_MCUX) += fsl_i2c.o obj-$(CONFIG_RANDOM_MCUX_RNGA) += fsl_rnga.o obj-$(CONFIG_RANDOM_MCUX_TRNG) += fsl_trng.o obj-$(CONFIG_SOC_FLASH_MCUX) += fsl_flash.o -obj-$(CONFIG_SPI_MCUX) += fsl_dspi.o +obj-$(CONFIG_SPI_MCUX_DSPI) += fsl_dspi.o obj-$(CONFIG_UART_MCUX) += fsl_uart.o obj-$(CONFIG_UART_MCUX_LPUART) += fsl_lpuart.o