From 83d8ffb2a0f64619861646736e3dfbb5ceeada8f Mon Sep 17 00:00:00 2001
From: Kumar Gala <kumar.gala@linaro.org>
Date: Tue, 28 Feb 2017 12:12:50 -0600
Subject: [PATCH] spi: mcux: Rename spi driver to DSPI to match naming
 convention

In prep for supporting the older KL2x SoCs that use a different SPI
block, rename the current SPI driver to DSPI to match what the MCUX HAL
defines it as.

Change-Id: I9097580df5fca649ab6fd9a38212fced0b1ea6ed
Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
---
 arch/arm/soc/nxp_kinetis/k6x/Kconfig.defconfig.mk64f12 | 2 +-
 drivers/spi/Kconfig                                    | 2 +-
 drivers/spi/{Kconfig.mcux => Kconfig.mcux_dspi}        | 6 +++---
 drivers/spi/Makefile                                   | 2 +-
 drivers/spi/{spi_mcux.c => spi_mcux_dspi.c}            | 0
 ext/hal/nxp/mcux/drivers/Makefile                      | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)
 rename drivers/spi/{Kconfig.mcux => Kconfig.mcux_dspi} (92%)
 rename drivers/spi/{spi_mcux.c => spi_mcux_dspi.c} (100%)

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