drivers: nxp: Convert to unified clock control macros

Convert NXP clock control drivers and clock consumer drivers to the new
unified macros. This has to be all in one commit because it is very hard
to make it bisectable otherwise. This is because many of the drivers
are actually benefitting from these macros due to they have a bunch of
code that is coupling to multiple different consumers and so forth.

NOTE: right now this commit is only containing clock driver changes, not
consumers. And they are not finished

Signed-off-by: Declan Snyder <[email protected]>

Author: Declan Snyder

drivers/clock_control/clock_control_mcux_sim.c

@@ -15,6 +15,42 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(clock_control);
 
+struct kinetis_sim_spec {
+	uint32_t name;
+	uint32_t offset;
+	uint32_t bits;
+};
+
+static int kinetis_sim_get_spec(clock_control_subsys_t subsys, struct kinetis_sim_spec *spec)
+{
+	struct clock_control_dt_spec *dt_spec = subsys;
+
+	if (dt_spec->len != 3) {
+		return -EINVAL;
+	}
+
+	spec->name = dt_spec->cells[0];
+	spec->offset = dt_spec->cells[1];
+	spec->bits = dt_spec->cells[2];
+
+	return 0;
+}
+
+static int kinetis_sim_get_key(clock_control_subsys_t subsys, uint32_t *key)
+{
+	struct kinetis_sim_spec spec;
+	int ret;
+
+	ret = kinetis_sim_get_spec(subsys, &spec);
+	if (ret) {
+		return ret;
+	}
+
+	*key = CLK_GATE_DEFINE(spec.offset, spec.bits);
+
+	return 0;
+}
+
 static int mcux_sim_on(const struct device *dev,
 		       clock_control_subsys_t sub_system)
 {

drivers/clock_control/clock_control_mcux_syscon.c

@@ -15,9 +15,48 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(clock_control);
 
+struct lpc_syscon_spec {
+	uint32_t name;
+};
+
+static int lpc_syscon_get_spec(clock_control_subsys_t subsys, struct lpc_syscon_spec *spec)
+{
+	struct clock_control_dt_spec *dt_spec = subsys;
+
+	if (dt_spec->len != 1) {
+		return -EINVAL;
+	}
+
+	spec->name = *(dt_spec->cells);
+
+	return 0;
+}
+
+static int lpc_syscon_get_name(clock_control_subsys_t dt_spec, uint32_t *name)
+{
+	struct lpc_syscon_spec spec;
+	int ret;
+
+	ret = lpc_syscon_get_spec(dt_spec, &spec);
+	if (ret) {
+		return ret;
+	}
+
+	*name = spec.name;
+
+	return 0;
+}
+
 static int mcux_lpc_syscon_clock_control_on(const struct device *dev,
-					    clock_control_subsys_t sub_system)
+					    clock_control_subsys_t subsys)
 {
+	uint32_t sub_system;
+
+	lpc_syscon_get_name(subsys, &sub_system);
+	if (ret) {
+		return ret;
+	}
+
 #if defined(CONFIG_CAN_MCUX_MCAN)
 	if ((uint32_t)sub_system == MCUX_MCAN_CLK) {
 		CLOCK_EnableClock(kCLOCK_Mcan);
@@ -149,7 +188,12 @@ static int mcux_lpc_syscon_clock_control_get_subsys_rate(const struct device *de
 							 clock_control_subsys_t sub_system,
 							 uint32_t *rate)
 {
-	uint32_t clock_name = (uint32_t)sub_system;
+	uint32_t clock_name = 0;
+
+	lpc_syscon_get_name(sub_system, &clock_name);
+	if (ret) {
+		return ret;
+	}
 
 	switch (clock_name) {
 
@@ -602,9 +646,14 @@ __weak int flexspi_clock_set_freq(uint32_t clock_name, uint32_t freq)
 static int SYSCON_SET_FUNC_ATTR mcux_lpc_syscon_clock_control_set_subsys_rate(
 	const struct device *dev, clock_control_subsys_t subsys, clock_control_subsys_rate_t rate)
 {
-	uint32_t clock_name = (uintptr_t)subsys;
+	uint32_t clock_name;
 	uint32_t clock_rate = (uintptr_t)rate;
 
+	lpc_syscon_get_name(subsys, &clock_name);
+	if (ret) {
+		return ret;
+	}
+
 	switch (clock_name) {
 	case MCUX_FLEXSPI_CLK:
 #if defined(CONFIG_MEMC)
@@ -632,10 +681,16 @@ static int SYSCON_SET_FUNC_ATTR mcux_lpc_syscon_clock_control_set_subsys_rate(
 static int mcux_lpc_syscon_clock_control_configure(const struct device *dev,
 						   clock_control_subsys_t sub_system, void *data)
 {
+	uint32_t clock_name = 0;
+	int flexcomm_num = -1;
+
+	lpc_syscon_get_name(sub_system, &clock_name);
+	if (ret) {
+		return ret;
+	}
+
 #ifdef CONFIG_SOC_SERIES_RW6XX
 #define FLEXCOMM_LP_CLK_DECODE(n) (n & 0x80)
-	uint32_t clock_name = (uint32_t)sub_system;
-	int flexcomm_num = -1;
 
 	switch (clock_name) {
 	case MCUX_FLEXCOMM0_CLK:

drivers/serial/uart_mcux_flexcomm.c

@@ -1417,8 +1417,7 @@ static void serial_mcux_flexcomm_##n##_pm_exit(enum pm_state state)		\
 static const struct mcux_flexcomm_config mcux_flexcomm_##n##_config = {		\
 	.base = (USART_Type *)DT_INST_REG_ADDR(n),				\
 	.clock_dev = DEVICE_DT_GET(DT_INST_CLOCKS_CTLR(n)),			\
-	.clock_subsys =								\
-	(clock_control_subsys_t)DT_INST_CLOCKS_CELL(n, name),			\
+	.clock_subsys =	CLOCK_CONTROL_DT_SPEC_INST_GET(n, clocks),		\
 	.baud_rate = DT_INST_PROP(n, current_speed),				\
 	.parity = DT_INST_ENUM_IDX(n, parity),					\
 	.pincfg = PINCTRL_DT_INST_DEV_CONFIG_GET(n),				\
@@ -1438,6 +1437,8 @@ static struct mcux_flexcomm_data mcux_flexcomm_##n##_data = {			\
 										\
 	PINCTRL_DT_INST_DEFINE(n);						\
 										\
+	CLOCK_CONTROL_DT_SPEC_INST_DEFINE(n, clocks);				\
+										\
 	UART_MCUX_FLEXCOMM_PM_UNLOCK_FUNC_DEFINE(n)				\
 	UART_MCUX_FLEXCOMM_WAKEUP_CFG_DEFINE(n)					\
 	UART_MCUX_FLEXCOMM_PM_HANDLES_DEFINE(n)					\