From 46aa69800109512852e7b942c4c2f72f60e4bb35 Mon Sep 17 00:00:00 2001
From: Glauber Maroto Ferreira <glauber.ferreira@espressif.com>
Date: Wed, 18 May 2022 10:55:22 -0300
Subject: [PATCH] boards: xtensa: odroid_go: dts: use pin grouping

update device tree pin states definitions and node
descriptions to group pins sharing common properties.

Signed-off-by: Glauber Maroto Ferreira <glauber.ferreira@espressif.com>
---
 .../xtensa/odroid_go/odroid_go-pinctrl.dtsi   | 60 ++++++++-----------
 boards/xtensa/odroid_go/odroid_go.dts         |  7 +--
 2 files changed, 29 insertions(+), 38 deletions(-)

diff --git a/boards/xtensa/odroid_go/odroid_go-pinctrl.dtsi b/boards/xtensa/odroid_go/odroid_go-pinctrl.dtsi
index 11af773bd9..7119716a22 100644
--- a/boards/xtensa/odroid_go/odroid_go-pinctrl.dtsi
+++ b/boards/xtensa/odroid_go/odroid_go-pinctrl.dtsi
@@ -10,44 +10,36 @@
 
 &pinctrl {
 
-	uart0_tx_gpio1: uart0_tx_gpio1 {
-		pinmux = <UART0_TX_GPIO1>;
+	uart0_default: uart0_default {
+		group1 {
+			pinmux = <UART0_TX_GPIO1>;
+		};
+		group2 {
+			pinmux = <UART0_RX_GPIO3>;
+			bias-pull-up;
+		};
 	};
 
-	uart0_rx_gpio3: uart0_rx_gpio3 {
-		pinmux = <UART0_RX_GPIO3>;
-		bias-pull-up;
+	spim3_default: spim3_default {
+		group1 {
+			pinmux = <SPIM3_MISO_GPIO19>,
+				 <SPIM3_SCLK_GPIO18>,
+				 <SPIM3_CSEL_GPIO5>;
+		};
+		group2 {
+			pinmux = <SPIM3_MOSI_GPIO23>;
+			output-low;
+		};
 	};
 
-	spim3_miso_gpio19: spim3_miso_gpio19 {
-		pinmux = <SPIM3_MISO_GPIO19>;
-	};
-
-	spim3_mosi_gpio23: spim3_mosi_gpio23 {
-		pinmux = <SPIM3_MOSI_GPIO23>;
-		output-low;
-	};
-
-	spim3_sclk_gpio18: spim3_sclk_gpio18 {
-		pinmux = <SPIM3_SCLK_GPIO18>;
-	};
-
-	spim3_csel_gpio5: spim3_csel_gpio5 {
-		pinmux = <SPIM3_CSEL_GPIO5>;
-	};
-
-	i2c0_sda_gpio4: i2c0_sda_gpio4 {
-		pinmux = <I2C0_SDA_GPIO4>;
-		bias-pull-up;
-		drive-open-drain;
-		output-high;
-	};
-
-	i2c0_scl_gpio15: i2c0_scl_gpio15 {
-		pinmux = <I2C0_SCL_GPIO15>;
-		bias-pull-up;
-		drive-open-drain;
-		output-high;
+	i2c0_default: i2c0_default {
+		group1 {
+			pinmux = <I2C0_SDA_GPIO4>,
+				 <I2C0_SCL_GPIO15>;
+			bias-pull-up;
+			drive-open-drain;
+			output-high;
+		};
 	};
 
 };
diff --git a/boards/xtensa/odroid_go/odroid_go.dts b/boards/xtensa/odroid_go/odroid_go.dts
index f23d11d49c..412eef9179 100644
--- a/boards/xtensa/odroid_go/odroid_go.dts
+++ b/boards/xtensa/odroid_go/odroid_go.dts
@@ -82,7 +82,7 @@
 &uart0 {
 	status = "okay";
 	current-speed = <115200>;
-	pinctrl-0 = <&uart0_tx_gpio1 &uart0_rx_gpio3>;
+	pinctrl-0 = <&uart0_default>;
 	pinctrl-names = "default";
 };
 
@@ -99,7 +99,7 @@
 	clock-frequency = <I2C_BITRATE_FAST>;
 	sda-pin = <4>;
 	scl-pin = <15>;
-	pinctrl-0 = <&i2c0_sda_gpio4 &i2c0_scl_gpio15>;
+	pinctrl-0 = <&i2c0_default>;
 	pinctrl-names = "default";
 };
 
@@ -107,8 +107,7 @@
 	#address-cells = <1>;
 	#size-cells = <0>;
 	status = "okay";
-	pinctrl-0 = <&spim3_miso_gpio19 &spim3_mosi_gpio23
-		     &spim3_sclk_gpio18 &spim3_csel_gpio5>;
+	pinctrl-0 = <&spim3_default>;
 	pinctrl-names = "default";
 
 	ili9341: ili9341@0 {