From a6b23e143b6db55043462dad386d11543e9c6417 Mon Sep 17 00:00:00 2001
From: Nick Ward <nix.ward@gmail.com>
Date: Sun, 22 Oct 2023 20:58:45 +1100
Subject: [PATCH] dts: esp32: fix gpio-reserved-ranges

Fixed to follow correct format.

Signed-off-by: Nick Ward <nix.ward@gmail.com>
---
 dts/xtensa/espressif/esp32/esp32_d0wd_v3.dtsi        | 2 +-
 dts/xtensa/espressif/esp32/esp32_d0wdr2_v3.dtsi      | 6 +++---
 dts/xtensa/espressif/esp32/esp32_net.dtsi            | 2 +-
 dts/xtensa/espressif/esp32/esp32_pico_d4.dtsi        | 4 ++--
 dts/xtensa/espressif/esp32/esp32_pico_v3.dtsi        | 4 ++--
 dts/xtensa/espressif/esp32/esp32_pico_v3_02.dtsi     | 4 ++--
 dts/xtensa/espressif/esp32/esp32_u4wdh.dtsi          | 2 +-
 dts/xtensa/espressif/esp32/esp32_wroom_32ue_n16.dtsi | 6 +++---
 dts/xtensa/espressif/esp32/esp32_wroom_32ue_n4.dtsi  | 6 +++---
 dts/xtensa/espressif/esp32/esp32_wroom_32ue_n8.dtsi  | 6 +++---
 dts/xtensa/espressif/esp32/esp32_wroom_da_n16.dtsi   | 8 ++++----
 dts/xtensa/espressif/esp32/esp32_wroom_da_n4.dtsi    | 8 ++++----
 dts/xtensa/espressif/esp32/esp32_wroom_da_n8.dtsi    | 8 ++++----
 dts/xtensa/espressif/esp32/esp32_wrover_e_n16r2.dtsi | 6 +++---
 dts/xtensa/espressif/esp32/esp32_wrover_e_n16r4.dtsi | 6 +++---
 dts/xtensa/espressif/esp32/esp32_wrover_e_n16r8.dtsi | 6 +++---
 dts/xtensa/espressif/esp32/esp32_wrover_e_n4r2.dtsi  | 6 +++---
 dts/xtensa/espressif/esp32/esp32_wrover_e_n4r8.dtsi  | 6 +++---
 dts/xtensa/espressif/esp32/esp32_wrover_e_n8r2.dtsi  | 6 +++---
 dts/xtensa/espressif/esp32/esp32_wrover_e_n8r8.dtsi  | 8 ++++----
 20 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/dts/xtensa/espressif/esp32/esp32_d0wd_v3.dtsi b/dts/xtensa/espressif/esp32/esp32_d0wd_v3.dtsi
index 6511f3d351..b2232505a9 100644
--- a/dts/xtensa/espressif/esp32/esp32_d0wd_v3.dtsi
+++ b/dts/xtensa/espressif/esp32/esp32_d0wd_v3.dtsi
@@ -8,7 +8,7 @@
 
 /* Reserved GPIO pins */
 &gpio0 {
-	gpio-reserved-ranges = <20>,<24>,<28 31>; // NC
+	gpio-reserved-ranges = <20 1>, <24 1>, <28 4>; // NC
 };
 
 /* Add flash or psram on board or application level */
diff --git a/dts/xtensa/espressif/esp32/esp32_d0wdr2_v3.dtsi b/dts/xtensa/espressif/esp32/esp32_d0wdr2_v3.dtsi
index eb5e239c1a..2703231b82 100644
--- a/dts/xtensa/espressif/esp32/esp32_d0wdr2_v3.dtsi
+++ b/dts/xtensa/espressif/esp32/esp32_d0wdr2_v3.dtsi
@@ -8,9 +8,9 @@
 
 /* Reserved GPIO pins */
 &gpio0 {
-	gpio-reserved-ranges =	<6 10>, // embeddef psram
-				<11>,	// flash CS
-				<20>,<24>,<28 31>; // NC
+	gpio-reserved-ranges =	<6 5>, // embeddef psram
+				<11 1>,	// flash CS
+				<20 1>, <24 1>, <28 4>; // NC
 };
 
 /* 2MB psram */
diff --git a/dts/xtensa/espressif/esp32/esp32_net.dtsi b/dts/xtensa/espressif/esp32/esp32_net.dtsi
index 00657ac042..b535749566 100644
--- a/dts/xtensa/espressif/esp32/esp32_net.dtsi
+++ b/dts/xtensa/espressif/esp32/esp32_net.dtsi
@@ -8,7 +8,7 @@
 
 /* Reserved GPIO pins */
 &gpio0 {
-	gpio-reserved-ranges = <20>,<24>,<28 31>; // NC
+	gpio-reserved-ranges = <20 1>, <24 1>, <28 4>; // NC
 };
 
 &flash0 {
diff --git a/dts/xtensa/espressif/esp32/esp32_pico_d4.dtsi b/dts/xtensa/espressif/esp32/esp32_pico_d4.dtsi
index 8ed101d24b..580d6fed89 100644
--- a/dts/xtensa/espressif/esp32/esp32_pico_d4.dtsi
+++ b/dts/xtensa/espressif/esp32/esp32_pico_d4.dtsi
@@ -8,8 +8,8 @@
 
 /* Reserved GPIO pins */
 &gpio0 {
-	gpio-reserved-ranges = <6 8>,<11>,<16 17>, // embedded flash
-				<20>, <24>, <28 31>; // NC
+	gpio-reserved-ranges = <6 3>, <11 1>, <16 2>, // embedded flash
+				<20 1>, <24 1>, <28 4>; // NC
 };
 
 /* 4MB flash */
diff --git a/dts/xtensa/espressif/esp32/esp32_pico_v3.dtsi b/dts/xtensa/espressif/esp32/esp32_pico_v3.dtsi
index 76e4d4c05e..d806b0b7c1 100644
--- a/dts/xtensa/espressif/esp32/esp32_pico_v3.dtsi
+++ b/dts/xtensa/espressif/esp32/esp32_pico_v3.dtsi
@@ -8,8 +8,8 @@
 
 /* Reserved GPIO pins */
 &gpio0 {
-	gpio-reserved-ranges = <16 18>,<23>,	// limitations
-				<24>,<28 31>;	// NC
+	gpio-reserved-ranges = <16 3>, <23 1>,	// limitations
+				<24 1>, <28 4>;	// NC
 };
 
 /* 4MB flash */
diff --git a/dts/xtensa/espressif/esp32/esp32_pico_v3_02.dtsi b/dts/xtensa/espressif/esp32/esp32_pico_v3_02.dtsi
index 249debca75..9d108bd4e5 100644
--- a/dts/xtensa/espressif/esp32/esp32_pico_v3_02.dtsi
+++ b/dts/xtensa/espressif/esp32/esp32_pico_v3_02.dtsi
@@ -8,8 +8,8 @@
 
 /* Reserved GPIO pins */
 &gpio0 {
-	gpio-reserved-ranges = <6 11>, // flash
-			<24 25>,<28 31>; // NC
+	gpio-reserved-ranges = <6 6>, // flash
+			<24 2>, <28 4>; // NC
 };
 
 /* 8MB flash */
diff --git a/dts/xtensa/espressif/esp32/esp32_u4wdh.dtsi b/dts/xtensa/espressif/esp32/esp32_u4wdh.dtsi
index d26074898f..34ca79156e 100644
--- a/dts/xtensa/espressif/esp32/esp32_u4wdh.dtsi
+++ b/dts/xtensa/espressif/esp32/esp32_u4wdh.dtsi
@@ -8,7 +8,7 @@
 
 /* Reserved GPIO pins */
 &gpio0 {
-	gpio-reserved-ranges = <20>, <24>, <28 31>;
+	gpio-reserved-ranges = <20 1>, <24 1>, <28 4>;
 };
 
 /* 4MB flash */
diff --git a/dts/xtensa/espressif/esp32/esp32_wroom_32ue_n16.dtsi b/dts/xtensa/espressif/esp32/esp32_wroom_32ue_n16.dtsi
index 2461a80395..43ce14117a 100644
--- a/dts/xtensa/espressif/esp32/esp32_wroom_32ue_n16.dtsi
+++ b/dts/xtensa/espressif/esp32/esp32_wroom_32ue_n16.dtsi
@@ -8,12 +8,12 @@
 
 /* Reserved GPIO pins */
 &gpio0 {
-	gpio-reserved-ranges = <6 11>, // flash
-			<20>, <24>, <28 31>; // NC
+	gpio-reserved-ranges = <6 6>, // flash
+			<20 1>, <24 1>, <28 4>; // NC
 };
 
 &gpio1 {
-	gpio-reserved-ranges = <6>,<7>; // GPIO37-38 NC
+	gpio-reserved-ranges = <6 2>; // GPIO37-38 NC
 };
 
 /* 16MB flash */
diff --git a/dts/xtensa/espressif/esp32/esp32_wroom_32ue_n4.dtsi b/dts/xtensa/espressif/esp32/esp32_wroom_32ue_n4.dtsi
index 9c8ef71acf..8f5f3d9dd1 100644
--- a/dts/xtensa/espressif/esp32/esp32_wroom_32ue_n4.dtsi
+++ b/dts/xtensa/espressif/esp32/esp32_wroom_32ue_n4.dtsi
@@ -8,12 +8,12 @@
 
 /* Reserved GPIO pins */
 &gpio0 {
-	gpio-reserved-ranges = <6 11>, // flash
-			<20>,<24>,<28 31>; // NC
+	gpio-reserved-ranges = <6 6>, // flash
+			<20 1>, <24 1>, <28 4>; // NC
 };
 
 &gpio1 {
-	gpio-reserved-ranges = <6>,<7>; // GPIO37-38 NC
+	gpio-reserved-ranges = <6 2>; // GPIO37-38 NC
 };
 
 /* 4MB flash */
diff --git a/dts/xtensa/espressif/esp32/esp32_wroom_32ue_n8.dtsi b/dts/xtensa/espressif/esp32/esp32_wroom_32ue_n8.dtsi
index 4dee1868cc..42813aa6e6 100644
--- a/dts/xtensa/espressif/esp32/esp32_wroom_32ue_n8.dtsi
+++ b/dts/xtensa/espressif/esp32/esp32_wroom_32ue_n8.dtsi
@@ -8,12 +8,12 @@
 
 /* Reserved GPIO pins */
 &gpio0 {
-	gpio-reserved-ranges = <6 11>,	// flash
-			<20>,<24>,<28 31>; // NC
+	gpio-reserved-ranges = <6 6>,	// flash
+			<20 1>, <24 1>, <28 4>; // NC
 };
 
 &gpio1 {
-	gpio-reserved-ranges = <6>,<7>; // GPIO37-38 NC
+	gpio-reserved-ranges = <6 2>; // GPIO37-38 NC
 };
 
 /* 8MB flash */
diff --git a/dts/xtensa/espressif/esp32/esp32_wroom_da_n16.dtsi b/dts/xtensa/espressif/esp32/esp32_wroom_da_n16.dtsi
index f034a5b289..f9f3bd8120 100644
--- a/dts/xtensa/espressif/esp32/esp32_wroom_da_n16.dtsi
+++ b/dts/xtensa/espressif/esp32/esp32_wroom_da_n16.dtsi
@@ -8,13 +8,13 @@
 
 /* Reserved GPIO pins */
 &gpio0 {
-	gpio-reserved-ranges = <2>,<25>, // NC/test
-				<6 11>, // flash
-				<20>,<24>,<28 31>; // NC
+	gpio-reserved-ranges = <2 1>, <25 1>, // NC/test
+				<6 6>, // flash
+				<20 1>, <24 1>, <28 4>; // NC
 };
 
 &gpio1 {
-	gpio-reserved-ranges = <6>,<7>; // GPIO37-38 NC
+	gpio-reserved-ranges = <6 2>; // GPIO37-38 NC
 };
 
 /* 16MB flash */
diff --git a/dts/xtensa/espressif/esp32/esp32_wroom_da_n4.dtsi b/dts/xtensa/espressif/esp32/esp32_wroom_da_n4.dtsi
index 324c1bba2d..98f6d9dc9b 100644
--- a/dts/xtensa/espressif/esp32/esp32_wroom_da_n4.dtsi
+++ b/dts/xtensa/espressif/esp32/esp32_wroom_da_n4.dtsi
@@ -8,13 +8,13 @@
 
 /* Reserved GPIO pins */
 &gpio0 {
-	gpio-reserved-ranges = <2>,<25>, // NC/test
-				<6 11>, // flash
-				<20>,<24>,<28 31>; // NC
+	gpio-reserved-ranges = <2 1>, <25 1>, // NC/test
+				<6 6>, // flash
+				<20 1>, <24 1>, <28 4>; // NC
 };
 
 &gpio1 {
-	gpio-reserved-ranges = <6>,<7>; // GPIO37-38 NC
+	gpio-reserved-ranges = <6 2>; // GPIO37-38 NC
 };
 
 /* 4MB flash */
diff --git a/dts/xtensa/espressif/esp32/esp32_wroom_da_n8.dtsi b/dts/xtensa/espressif/esp32/esp32_wroom_da_n8.dtsi
index ec5583c440..7beeda4e13 100644
--- a/dts/xtensa/espressif/esp32/esp32_wroom_da_n8.dtsi
+++ b/dts/xtensa/espressif/esp32/esp32_wroom_da_n8.dtsi
@@ -8,13 +8,13 @@
 
 /* Reserved GPIO pins */
 &gpio0 {
-	gpio-reserved-ranges = <2>,<25>, // NC/test
-				<6 11>, // flash
-				<20>,<24>,<28 31>; // NC
+	gpio-reserved-ranges = <2 1>, <25 1>, // NC/test
+				<6 6>, // flash
+				<20 1>, <24 1>, <28 4>; // NC
 };
 
 &gpio1 {
-	gpio-reserved-ranges = <6>,<7>; // GPIO37-38 NC
+	gpio-reserved-ranges = <6 2>; // GPIO37-38 NC
 };
 
 /* 8MB flash */
diff --git a/dts/xtensa/espressif/esp32/esp32_wrover_e_n16r2.dtsi b/dts/xtensa/espressif/esp32/esp32_wrover_e_n16r2.dtsi
index 712d86fc0f..393dfa7b95 100644
--- a/dts/xtensa/espressif/esp32/esp32_wrover_e_n16r2.dtsi
+++ b/dts/xtensa/espressif/esp32/esp32_wrover_e_n16r2.dtsi
@@ -8,12 +8,12 @@
 
 /* Reserved GPIO pins */
 &gpio0 {
-	gpio-reserved-ranges = <6 11>,<16 17>,  // flash&psram
-			<20>,<24>,<28 31>; // NC
+	gpio-reserved-ranges = <6 6>, <16 2>,  // flash&psram
+			<20 1>, <24 1>, <28 4>; // NC
 };
 
 &gpio1 {
-	gpio-reserved-ranges = <6>,<7>; // GPIO37-38 NC
+	gpio-reserved-ranges = <6 2>; // GPIO37-38 NC
 };
 
 /* 16MB flash */
diff --git a/dts/xtensa/espressif/esp32/esp32_wrover_e_n16r4.dtsi b/dts/xtensa/espressif/esp32/esp32_wrover_e_n16r4.dtsi
index 119e3e3ed6..160800afdc 100644
--- a/dts/xtensa/espressif/esp32/esp32_wrover_e_n16r4.dtsi
+++ b/dts/xtensa/espressif/esp32/esp32_wrover_e_n16r4.dtsi
@@ -8,12 +8,12 @@
 
 /* Reserved GPIO pins */
 &gpio0 {
-	gpio-reserved-ranges = <6 11>,<16 17>,  // flash&psram
-			<20>,<24>,<28 31>; // NC
+	gpio-reserved-ranges = <6 6>, <16 2>,  // flash&psram
+			<20 1>, <24 1>, <28 4>; // NC
 };
 
 &gpio1 {
-	gpio-reserved-ranges = <6>,<7>; // GPIO37-38 NC
+	gpio-reserved-ranges = <6 2>; // GPIO37-38 NC
 };
 
 /* 16MB flash */
diff --git a/dts/xtensa/espressif/esp32/esp32_wrover_e_n16r8.dtsi b/dts/xtensa/espressif/esp32/esp32_wrover_e_n16r8.dtsi
index 10ab7f11fa..acac866076 100644
--- a/dts/xtensa/espressif/esp32/esp32_wrover_e_n16r8.dtsi
+++ b/dts/xtensa/espressif/esp32/esp32_wrover_e_n16r8.dtsi
@@ -8,12 +8,12 @@
 
 /* Reserved GPIO pins */
 &gpio0 {
-	gpio-reserved-ranges = <6 11>,<16 17>,  // flash&psram
-			<20>,<24>,<28 31>; // NC
+	gpio-reserved-ranges = <6 6>, <16 2>,  // flash&psram
+			<20 1>, <24 1>, <28 4>; // NC
 };
 
 &gpio1 {
-	gpio-reserved-ranges = <6>,<7>; // GPIO37-38 NC
+	gpio-reserved-ranges = <6 2>; // GPIO37-38 NC
 };
 
 /* 16MB flash */
diff --git a/dts/xtensa/espressif/esp32/esp32_wrover_e_n4r2.dtsi b/dts/xtensa/espressif/esp32/esp32_wrover_e_n4r2.dtsi
index b4367cc223..8e463a3b3a 100644
--- a/dts/xtensa/espressif/esp32/esp32_wrover_e_n4r2.dtsi
+++ b/dts/xtensa/espressif/esp32/esp32_wrover_e_n4r2.dtsi
@@ -8,12 +8,12 @@
 
 /* Reserved GPIO pins */
 &gpio0 {
-	gpio-reserved-ranges = <6 11>,<16 17>,  // flash&psram
-			<20>,<24>,<28 31>; // NC
+	gpio-reserved-ranges = <6 6>, <16 2>,  // flash&psram
+			<20 1>, <24 1>, <28 4>; // NC
 };
 
 &gpio1 {
-	gpio-reserved-ranges = <6>,<7>; // GPIO37-38 NC
+	gpio-reserved-ranges = <6 1>, <7 1>; // GPIO37-38 NC
 };
 
 /* 4MB flash */
diff --git a/dts/xtensa/espressif/esp32/esp32_wrover_e_n4r8.dtsi b/dts/xtensa/espressif/esp32/esp32_wrover_e_n4r8.dtsi
index ef6037b394..0197755fba 100644
--- a/dts/xtensa/espressif/esp32/esp32_wrover_e_n4r8.dtsi
+++ b/dts/xtensa/espressif/esp32/esp32_wrover_e_n4r8.dtsi
@@ -8,12 +8,12 @@
 
 /* Reserved GPIO pins */
 &gpio0 {
-	gpio-reserved-ranges = <6 11>,<16 17>,  // flash&psram
-			<20>,<24>,<28 31>; // NC
+	gpio-reserved-ranges = <6 6>, <16 2>,  // flash&psram
+			<20 1>, <24 1>, <28 4>; // NC
 };
 
 &gpio1 {
-	gpio-reserved-ranges = <6>,<7>; // GPIO37-38 NC
+	gpio-reserved-ranges = <6 1>, <7 1>; // GPIO37-38 NC
 };
 
 /* 4MB flash */
diff --git a/dts/xtensa/espressif/esp32/esp32_wrover_e_n8r2.dtsi b/dts/xtensa/espressif/esp32/esp32_wrover_e_n8r2.dtsi
index e8d902c73a..5bc98caf70 100644
--- a/dts/xtensa/espressif/esp32/esp32_wrover_e_n8r2.dtsi
+++ b/dts/xtensa/espressif/esp32/esp32_wrover_e_n8r2.dtsi
@@ -8,12 +8,12 @@
 
 /* Reserved GPIO pins */
 &gpio0 {
-	gpio-reserved-ranges = <6 11>,<16 17>,  // flash&psram
-			<20>,<24>,<28 31>; // NC
+	gpio-reserved-ranges = <6 6>, <16 2>,  // flash&psram
+			<20 1>, <24 1>, <28 4>; // NC
 };
 
 &gpio1 {
-	gpio-reserved-ranges = <6>,<7>; // GPIO37-38 NC
+	gpio-reserved-ranges = <6 2>; // GPIO37-38 NC
 };
 
 /* 8MB flash */
diff --git a/dts/xtensa/espressif/esp32/esp32_wrover_e_n8r8.dtsi b/dts/xtensa/espressif/esp32/esp32_wrover_e_n8r8.dtsi
index 1ab318f358..0f73058de0 100644
--- a/dts/xtensa/espressif/esp32/esp32_wrover_e_n8r8.dtsi
+++ b/dts/xtensa/espressif/esp32/esp32_wrover_e_n8r8.dtsi
@@ -8,13 +8,13 @@
 
 /* Reserved GPIO pins */
 &gpio0 {
-	gpio-reserved-ranges = <20>, <24>, <28 31>;
-	gpio-reserved-ranges = <6 11>,<16 17>,  // flash&psram
-			<20>,<24>,<28 31>; // NC
+	gpio-reserved-ranges = <20 1>, <24 1>, <28 4>;
+	gpio-reserved-ranges = <6 6>, <16 2>,  // flash&psram
+			<20 1>, <24 1>, <28 4>; // NC
 };
 
 &gpio1 {
-	gpio-reserved-ranges = <6>,<7>; // GPIO37-38 NC
+	gpio-reserved-ranges = <6 2>; // GPIO37-38 NC
 };
 
 /* 8MB flash */