From 2fbb4d35d2d19198bb8df28e9726faf7a79766ff Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@nxp.com>
Date: Mon, 16 Apr 2018 16:35:02 -0500
Subject: [PATCH] spi: Refactor mcux dspi shim driver to use clock control
 interface

Refactors the mcux dspi shim driver to use the clock control interface
instead of calling CLOCK_GetFreq() directly. With this change, we are
now getting all soc-specific information from device tree and can remove
the direct dependency on soc.h.

Signed-off-by: Maureen Helm <maureen.helm@nxp.com>
---
 drivers/spi/Kconfig.mcux_dspi |  2 +-
 drivers/spi/spi_mcux_dspi.c   | 26 +++++++++++++++++---------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/drivers/spi/Kconfig.mcux_dspi b/drivers/spi/Kconfig.mcux_dspi
index bef5e32fd05..e8be466d4c2 100644
--- a/drivers/spi/Kconfig.mcux_dspi
+++ b/drivers/spi/Kconfig.mcux_dspi
@@ -8,7 +8,7 @@
 
 menuconfig SPI_MCUX_DSPI
 	bool "MCUX SPI driver"
-	depends on HAS_MCUX
+	depends on HAS_MCUX && CLOCK_CONTROL
 	select HAS_DTS_SPI
 	default n
 	help
diff --git a/drivers/spi/spi_mcux_dspi.c b/drivers/spi/spi_mcux_dspi.c
index 62e0bdad7b0..85489e82c7b 100644
--- a/drivers/spi/spi_mcux_dspi.c
+++ b/drivers/spi/spi_mcux_dspi.c
@@ -7,9 +7,8 @@
 
 #include <errno.h>
 #include <spi.h>
-#include <soc.h>
+#include <clock_control.h>
 #include <fsl_dspi.h>
-#include <fsl_clock.h>
 
 #define SYS_LOG_LEVEL CONFIG_SYS_LOG_SPI_LEVEL
 #include <logging/sys_log.h>
@@ -18,7 +17,8 @@
 
 struct spi_mcux_config {
 	SPI_Type *base;
-	clock_name_t clock_source;
+	char *clock_name;
+	clock_control_subsys_t clock_subsys;
 	void (*irq_config_func)(struct device *dev);
 };
 
@@ -123,6 +123,7 @@ static int spi_mcux_configure(struct device *dev,
 	struct spi_mcux_data *data = dev->driver_data;
 	SPI_Type *base = config->base;
 	dspi_master_config_t master_config;
+	struct device *clock_dev;
 	u32_t clock_freq;
 	u32_t word_size;
 
@@ -160,9 +161,13 @@ static int spi_mcux_configure(struct device *dev,
 
 	master_config.ctarConfig.baudRate = spi_cfg->frequency;
 
-	clock_freq = CLOCK_GetFreq(config->clock_source);
-	if (!clock_freq) {
-		SYS_LOG_ERR("Got frequency of 0");
+	clock_dev = device_get_binding(config->clock_name);
+	if (clock_dev == NULL) {
+		return -EINVAL;
+	}
+
+	if (clock_control_get_rate(clock_dev, config->clock_subsys,
+				   &clock_freq)) {
 		return -EINVAL;
 	}
 
@@ -261,7 +266,8 @@ static void spi_mcux_config_func_0(struct device *dev);
 
 static const struct spi_mcux_config spi_mcux_config_0 = {
 	.base = (SPI_Type *) CONFIG_SPI_0_BASE_ADDRESS,
-	.clock_source = DSPI0_CLK_SRC,
+	.clock_name = CONFIG_SPI_0_CLOCK_NAME,
+	.clock_subsys = (clock_control_subsys_t) CONFIG_SPI_0_CLOCK_SUBSYS,
 	.irq_config_func = spi_mcux_config_func_0,
 };
 
@@ -289,7 +295,8 @@ static void spi_mcux_config_func_1(struct device *dev);
 
 static const struct spi_mcux_config spi_mcux_config_1 = {
 	.base = (SPI_Type *) CONFIG_SPI_1_BASE_ADDRESS,
-	.clock_source = DSPI1_CLK_SRC,
+	.clock_name = CONFIG_SPI_1_CLOCK_NAME,
+	.clock_subsys = (clock_control_subsys_t) CONFIG_SPI_1_CLOCK_SUBSYS,
 	.irq_config_func = spi_mcux_config_func_1,
 };
 
@@ -317,7 +324,8 @@ static void spi_mcux_config_func_2(struct device *dev);
 
 static const struct spi_mcux_config spi_mcux_config_2 = {
 	.base = (SPI_Type *) CONFIG_SPI_2_BASE_ADDRESS,
-	.clock_source = DSPI2_CLK_SRC,
+	.clock_name = CONFIG_SPI_2_CLOCK_NAME,
+	.clock_subsys = (clock_control_subsys_t) CONFIG_SPI_2_CLOCK_SUBSYS,
 	.irq_config_func = spi_mcux_config_func_2,
 };