diff --git a/drivers/serial/uart_b91.c b/drivers/serial/uart_b91.c
index a7b476462fc..40843072446 100644
--- a/drivers/serial/uart_b91.c
+++ b/drivers/serial/uart_b91.c
@@ -9,8 +9,7 @@
 
 #include <device.h>
 #include <drivers/uart.h>
-#include <drivers/pinmux.h>
-#include <dt-bindings/pinctrl/b91-pinctrl.h>
+#include <drivers/pinctrl.h>
 
 
 /* Driver dts compatibility: telink,b91_uart */
@@ -65,8 +64,7 @@ struct uart_b91_data {
 
 /* B91 UART config structure */
 struct uart_b91_config {
-	const uint32_t *pinctrl_list;
-	size_t pinctrl_list_size;
+	const struct pinctrl_dev_config *pcfg;
 	uint32_t uart_addr;
 	uint32_t baud_rate;
 	void (*pirq_connect)(void);
@@ -292,6 +290,7 @@ static int uart_b91_config_get(const struct device *dev,
 			       struct uart_config *cfg)
 {
 	struct uart_b91_data *data = dev->data;
+
 	*cfg = data->cfg;
 
 	return 0;
@@ -300,20 +299,16 @@ static int uart_b91_config_get(const struct device *dev,
 /* API implementation: driver initialization */
 static int uart_b91_driver_init(const struct device *dev)
 {
+	int status = 0;
 	uint16_t divider = 0u;
 	uint8_t bwpc = 0u;
-	const struct device *pinmux;
 	volatile struct uart_b91_t *uart = GET_UART(dev);
 	const struct uart_b91_config *cfg = dev->config;
 
-	pinmux = DEVICE_DT_GET(DT_NODELABEL(pinmux));
-	if (!device_is_ready(pinmux)) {
-		return -ENODEV;
-	}
-
-	for (int i = 0; i < cfg->pinctrl_list_size; i++) {
-		pinmux_pin_set(pinmux, B91_PINMUX_GET_PIN(cfg->pinctrl_list[i]),
-			       B91_PINMUX_GET_FUNC(cfg->pinctrl_list[i]));
+	/* configure pins */
+	status = pinctrl_apply_state(cfg->pcfg, PINCTRL_STATE_DEFAULT);
+	if (status < 0) {
+		return status;
 	}
 
 	uart_b91_cal_div_and_bwpc(cfg->baud_rate, sys_clk.pclk * 1000 * 1000, &divider, &bwpc);
@@ -543,15 +538,13 @@ static const struct uart_driver_api uart_b91_driver_api = {
 										    \
 	static void uart_b91_irq_connect_##n(void);				    \
 										    \
-	static const uint32_t uart_pins_##n[] =					    \
-		B91_PINMUX_DT_INST_GET_ARRAY(n, 0);				    \
+	PINCTRL_DT_INST_DEFINE(n);						    \
 										    \
 	static const struct uart_b91_config uart_b91_cfg_##n =			    \
 	{									    \
 		.uart_addr = DT_INST_REG_ADDR(n),				    \
 		.baud_rate = DT_INST_PROP(n, current_speed),			    \
-		.pinctrl_list_size = ARRAY_SIZE(uart_pins_##n),			    \
-		.pinctrl_list = uart_pins_##n,					    \
+		.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(n),			    \
 		.pirq_connect = uart_b91_irq_connect_##n			    \
 	};									    \
 										    \