boards: arm: v2m_beetle: add pinctrl support for v2m_beetle

Adds initial pinctrl support to arm v2m_beetle board target.

Signed-off-by: Samuel Chee <samche01@arm.com>
Signed-off-by: Sudan Landge <sudan.landge@arm.com>

boards/arm/v2m_beetle/CMakeLists.txt

@@ -1,4 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-zephyr_library()
-zephyr_library_sources(pinmux.c)

boards/arm/v2m_beetle/pinmux.c

@@ -1,144 +0,0 @@
-/*
- * Copyright (c) 2016 Linaro Limited
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/device.h>
-#include <zephyr/init.h>
-#include <zephyr/kernel.h>
-#include <soc.h>
-#include <zephyr/sys/sys_io.h>
-#include <zephyr/drivers/gpio/gpio_cmsdk_ahb.h>
-
-/**
- * @brief Pinmux driver for ARM V2M Beetle Board
- *
- * The ARM V2M Beetle Board has 4 GPIO controllers. These controllers
- * are responsible for pin muxing, input/output, pull-up, etc.
- *
- * The GPIO controllers 2 and 3 are reserved and therefore not exposed by
- * this driver.
- *
- * All GPIO controller exposed pins are exposed via the following sequence of
- * pin numbers:
- *   Pins  0 -  15 are for GPIO0
- *   Pins 16 -  31 are for GPIO1
- *
- * For the exposed GPIO controllers ARM V2M Beetle Board follows the Arduino
- * compliant pin out.
- */
-
-#define CMSDK_AHB_GPIO0_DEV \
-	((volatile struct gpio_cmsdk_ahb *)DT_REG_ADDR(DT_NODELABEL(gpio0)))
-#define CMSDK_AHB_GPIO1_DEV \
-	((volatile struct gpio_cmsdk_ahb *)DT_REG_ADDR(DT_NODELABEL(gpio1)))
-
-/*
- * This is the mapping from the ARM V2M Beetle Board pins to GPIO
- * controllers.
- *
- * D0 : P0_0
- * D1 : P0_1
- * D2 : P0_2
- * D3 : P0_3
- * D4 : P0_4
- * D5 : P0_5
- * D6 : P0_6
- * D7 : P0_7
- * D8 : P0_8
- * D9 : P0_9
- * D10 : P0_10
- * D11 : P0_11
- * D12 : P0_12
- * D13 : P0_13
- * D14 : P0_14
- * D15 : P0_15
- * D16 : P1_0
- * D17 : P1_1
- * D18 : P1_2
- * D19 : P1_3
- * D20 : P1_4
- * D21 : P1_5
- * D22 : P1_6
- * D23 : P1_7
- * D24 : P1_8
- * D25 : P1_9
- * D26 : P1_10
- * D27 : P1_11
- * D28 : P1_12
- * D29 : P1_13
- * D30 : P1_14
- * D31 : P1_15
- *
- * UART_0_RX : D0
- * UART_0_TX : D1
- * SPI_0_CS : D10
- * SPI_0_MOSI : D11
- * SPI_0_MISO : D12
- * SPI_0_SCLK : D13
- * I2C_0_SCL : D14
- * I2C_0_SDA : D15
- * UART_1_RX : D16
- * UART_1_TX : D17
- * SPI_1_CS : D18
- * SPI_1_MOSI : D19
- * SPI_1_MISO : D20
- * SPI_1_SCK : D21
- * I2C_1_SDA : D22
- * I2C_1_SCL : D23
- *
- */
-static void arm_v2m_beetle_pinmux_defaults(void)
-{
-	uint32_t gpio_0 = 0U;
-	uint32_t gpio_1 = 0U;
-
-	/* Set GPIO Alternate Functions */
-
-	gpio_0 = (1<<0); /* Shield 0 UART 0 RXD */
-	gpio_0 |= (1<<1); /* Shield 0 UART 0 TXD */
-	gpio_0 |= (1<<14); /* Shield 0 I2C SDA SBCON2 */
-	gpio_0 |= (1<<15); /* Shield 0 I2C SCL SBCON2 */
-	gpio_0 |= (1<<10); /* Shield 0 SPI_3 nCS */
-	gpio_0 |= (1<<11); /* Shield 0 SPI_3 MOSI */
-	gpio_0 |= (1<<12); /* Shield 0 SPI_3 MISO */
-	gpio_0 |= (1<<13); /* Shield 0 SPI_3 SCK */
-
-	CMSDK_AHB_GPIO0_DEV->altfuncset = gpio_0;
-
-	gpio_1 = (1<<0); /* UART 1 RXD */
-	gpio_1 |= (1<<1); /* UART 1 TXD */
-	gpio_1 |= (1<<6); /* Shield 1 I2C SDA */
-	gpio_1 |= (1<<7); /* Shield 1 I2C SCL */
-	gpio_1 |= (1<<2); /* ADC SPI_1 nCS */
-	gpio_1 |= (1<<3); /* ADC SPI_1 MOSI */
-	gpio_1 |= (1<<4); /* ADC SPI_1 MISO */
-	gpio_1 |= (1<<5); /* ADC SPI_1 SCK */
-
-	gpio_1 |= (1<<8); /* QSPI CS 2 */
-	gpio_1 |= (1<<9); /* QSPI CS 1 */
-	gpio_1 |= (1<<10); /* QSPI IO 0 */
-	gpio_1 |= (1<<11); /* QSPI IO 1 */
-	gpio_1 |= (1<<12); /* QSPI IO 2 */
-	gpio_1 |= (1<<13); /* QSPI IO 3 */
-	gpio_1 |= (1<<14); /* QSPI SCK */
-
-	CMSDK_AHB_GPIO1_DEV->altfuncset = gpio_1;
-
-	/* Set the ARD_PWR_EN GPIO1[15] as an output */
-	CMSDK_AHB_GPIO1_DEV->outenableset |= (0x1 << 15);
-	/* Set on 3v3 (for ARDUINO HDR compliance) */
-	CMSDK_AHB_GPIO1_DEV->data |= (0x1 << 15);
-}
-
-static int arm_v2m_beetle_pinmux_init(void)
-{
-
-	arm_v2m_beetle_pinmux_defaults();
-
-	return 0;
-}
-
-SYS_INIT(arm_v2m_beetle_pinmux_init, PRE_KERNEL_1,
-	CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);

boards/arm/v2m_beetle/v2m_beetle-pinctrl.dtsi

@@ -0,0 +1,66 @@
+/*
+ * Copyright 2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/pinctrl/arm-v2m_beetle-pinctrl.h>
+
+&pinctrl {
+	/omit-if-no-ref/  uart0_default: uart0_default {
+		group1 {
+			pinmux = <UART0_TXD_EXP>;
+		};
+
+		group2 {
+			pinmux = <UART0_RXD_EXP>;
+			input-enable;
+		};
+	};
+
+	/omit-if-no-ref/ uart1_default: uart1_default {
+		group1 {
+			pinmux = <UART1_TXD_EXP>;
+		};
+
+		group2 {
+			pinmux = <UART1_RXD_EXP>;
+			input-enable;
+		};
+	};
+
+	/omit-if-no-ref/ spi0_default: spi0_default {
+		group1 {
+			pinmux = <SPI0_SS_EXP>, <SPI0_MOSI_EXP>, <SPI0_SCK_EXP>;
+		};
+		group2 {
+			pinmux = <SPI0_MISO_EXP>;
+			input-enable;
+		};
+	};
+
+	/omit-if-no-ref/ spi1_default: spi1_default {
+		group1 {
+			pinmux = <SPI1_SCK_EXP>, <SPI1_SS_EXP>, <SPI0_MOSI_EXP>;
+
+		};
+		group2 {
+			pinmux = <SPI1_MISO_EXP>;
+			input-enable;
+		};
+	};
+
+	/omit-if-no-ref/ sbcon0_default: sbcon0_default {
+		group1 {
+			pinmux = <SBCON0_SDA_EXP>, <SBCON0_SCL_EXP>;
+			input-enable;
+		};
+	};
+
+	/omit-if-no-ref/ sbcon1_default: sbcon1_default {
+		group1 {
+			pinmux = <SBCON1_SDA_EXP>, <SBCON1_SCL_EXP>;
+			input-enable;
+		};
+	};
+};

boards/arm/v2m_beetle/v2m_beetle.dts

@@ -74,6 +74,8 @@
 			interrupts = <0 3>;
 			clocks = <&sysclk &syscon>;
 			current-speed = <115200>;
+			pinctrl-0 = <&uart0_default>;
+			pinctrl-names = "default";
 		};
 
 		uart1: uart@40005000 {
@@ -82,6 +84,8 @@
 			interrupts = <2 3>;
 			clocks = <&sysclk &syscon>;
 			current-speed = <115200>;
+			pinctrl-0 = <&uart1_default>;
+			pinctrl-names = "default";
 		};
 
 		wdog0: wdog@40008000 {
@@ -131,9 +135,15 @@
 			reg = <0x4001f000 0x1000>;
 			#clock-cells = <0>;
 		};
+
+		pinctrl: pinctrl {
+			compatible = "arm,mps3-pinctrl";
+			status = "okay";
+		};
 	};
 };
 
 &nvic {
 	arm,num-irq-priority-bits = <3>;
 };
+#include "v2m_beetle-pinctrl.dtsi"