diff --git a/drivers/serial/uart_k20.c b/drivers/serial/uart_k20.c
index c22cd6dafea..ebe0748cb4a 100644
--- a/drivers/serial/uart_k20.c
+++ b/drivers/serial/uart_k20.c
@@ -99,8 +99,6 @@ static int uart_k20_init(struct device *dev)
 	dev_cfg->irq_config_func(dev);
 #endif
 
-	dev->driver_api = &uart_k20_driver_api;
-
 	return 0;
 }
 
@@ -429,9 +427,10 @@ static struct uart_k20_dev_data_t uart_k20_dev_data_0 = {
 	.baud_rate = CONFIG_UART_K20_PORT_0_BAUD_RATE,
 };
 
-DEVICE_INIT(uart_k20_0, CONFIG_UART_K20_PORT_0_NAME, &uart_k20_init,
-			&uart_k20_dev_data_0, &uart_k20_dev_cfg_0,
-			PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
+DEVICE_AND_API_INIT(uart_k20_0, CONFIG_UART_K20_PORT_0_NAME, &uart_k20_init,
+		    &uart_k20_dev_data_0, &uart_k20_dev_cfg_0,
+		    PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
+		    &uart_k20_driver_api);
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 static void irq_config_func_0(struct device *dev)
@@ -465,9 +464,10 @@ static struct uart_k20_dev_data_t uart_k20_dev_data_1 = {
 	.baud_rate = CONFIG_UART_K20_PORT_1_BAUD_RATE,
 };
 
-DEVICE_INIT(uart_k20_1, CONFIG_UART_K20_PORT_1_NAME, &uart_k20_init,
-			&uart_k20_dev_data_1, &uart_k20_dev_cfg_1,
-			PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
+DEVICE_AND_API_INIT(uart_k20_1, CONFIG_UART_K20_PORT_1_NAME, &uart_k20_init,
+		    &uart_k20_dev_data_1, &uart_k20_dev_cfg_1,
+		    PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
+		    &uart_k20_driver_api);
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 static void irq_config_func_1(struct device *dev)
@@ -501,9 +501,10 @@ static struct uart_k20_dev_data_t uart_k20_dev_data_2 = {
 	.baud_rate = CONFIG_UART_K20_PORT_2_BAUD_RATE,
 };
 
-DEVICE_INIT(uart_k20_2, CONFIG_UART_K20_PORT_2_NAME, &uart_k20_init,
-			&uart_k20_dev_data_2, &uart_k20_dev_cfg_2,
-			PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
+DEVICE_AND_API_INIT(uart_k20_2, CONFIG_UART_K20_PORT_2_NAME, &uart_k20_init,
+		    &uart_k20_dev_data_2, &uart_k20_dev_cfg_2,
+		    PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
+		    &uart_k20_driver_api);
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 static void irq_config_func_2(struct device *dev)
@@ -537,9 +538,10 @@ static struct uart_k20_dev_data_t uart_k20_dev_data_3 = {
 	.baud_rate = CONFIG_UART_K20_PORT_3_BAUD_RATE,
 };
 
-DEVICE_INIT(uart_k20_3, CONFIG_UART_K20_PORT_3_NAME, &uart_k20_init,
-			&uart_k20_dev_data_3, &uart_k20_dev_cfg_3,
-			PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
+DEVICE_AND_API_INIT(uart_k20_3, CONFIG_UART_K20_PORT_3_NAME, &uart_k20_init,
+		    &uart_k20_dev_data_3, &uart_k20_dev_cfg_3,
+		    PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
+		    &uart_k20_driver_api);
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 static void irq_config_func_3(struct device *dev)
@@ -573,9 +575,10 @@ static struct uart_k20_dev_data_t uart_k20_dev_data_4 = {
 	.baud_rate = CONFIG_UART_K20_PORT_4_BAUD_RATE,
 };
 
-DEVICE_INIT(uart_k20_4, CONFIG_UART_K20_PORT_4_NAME, &uart_k20_init,
-			&uart_k20_dev_data_4, &uart_k20_dev_cfg_4,
-			PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
+DEVICE_AND_API_INIT(uart_k20_4, CONFIG_UART_K20_PORT_4_NAME, &uart_k20_init,
+		    &uart_k20_dev_data_4, &uart_k20_dev_cfg_4,
+		    PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
+		    &uart_k20_driver_api);
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 static void irq_config_func_4(struct device *dev)