boards: arm: mercury_xu: Define the pinctrl instance

Define the pinctrl-based pin controller instance
for the Mercury XU board and remove the old implementation

Signed-off-by: Jan Bylicki <[email protected]>

Author: jbylicki

boards/arm/mercury_xu/board.c

@@ -6,24 +6,9 @@
 
 #include <zephyr/arch/cpu.h>
 #include <zephyr/init.h>
-#define MIO_PIN_18	0xff180048
-#define MIO_PIN_19	0xff18004c
-#define MIO_PIN_38	0xff180098
-#define MIO_PIN_39	0xff18009c
-
-#define MIO_DEFAULT	0x0
-#define MIO_UART0	0xc0
 
 static int mercury_xu_init(void)
 {
-	/* pinmux settings for uart */
-	sys_write32(MIO_UART0, MIO_PIN_38);
-	sys_write32(MIO_UART0, MIO_PIN_39);
-
-	/* disable misleading pinmux */
-	sys_write32(MIO_DEFAULT, MIO_PIN_18);
-	sys_write32(MIO_DEFAULT, MIO_PIN_19);
-
 	return 0;
 }
 

boards/arm/mercury_xu/mercury_xu-pinctrl.dtsi

@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2024 Antmicro <www.antmicro.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <dt-bindings/pinctrl/pinctrl-zynqmp.h>
+
+&pinctrl {
+	uart0_default: uart0_default {
+		group1 {
+			pinmux = <UART0_RX_38>;
+		};
+		group2 {
+			pinmux = <UART0_TX_39>;
+		};
+	};
+};

boards/arm/mercury_xu/mercury_xu.dts

@@ -6,6 +6,7 @@
 
 /dts-v1/;
 #include <arm/xilinx/zynqmp_rpu.dtsi>
+#include "mercury_xu-pinctrl.dtsi"
 
 / {
 	model = "Mercury XU";
@@ -28,6 +29,8 @@
 	status = "okay";
 	current-speed = <115200>;
 	clock-frequency = <99999901>;
+	pinctrl-0 = <&uart0_default>;
+	pinctrl-names = "default";
 };
 
 &ttc0 {

boards/arm/mercury_xu/mercury_xu_defconfig

@@ -11,3 +11,5 @@ CONFIG_UART_CONSOLE=y
 
 # enable timer
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=100
+
+CONFIG_PINCTRL=y