From d34f725df81852b468dba2727a4d569022cb907d Mon Sep 17 00:00:00 2001
From: Marek Matej <marek.matej@espressif.com>
Date: Thu, 16 Nov 2023 19:28:13 +0100
Subject: [PATCH] soc: xtensa: esp32s3: Update SOC variant list

Add missing combinations of the ESP32-S3 Wroom module.

Signed-off-by: Marek Matej <marek.matej@espressif.com>
---
 .../espressif/esp32s3/esp32s3_wroom_n16r2.dtsi | 18 ++++++++++++++++++
 .../espressif/esp32s3/esp32s3_wroom_n4r2.dtsi  | 18 ++++++++++++++++++
 .../espressif/esp32s3/esp32s3_wroom_n8r2.dtsi  | 18 ++++++++++++++++++
 .../espressif/esp32s3/esp32s3_wroom_n8r8.dtsi  |  1 +
 soc/xtensa/espressif_esp32/esp32s3/Kconfig.soc |  8 +++++++-
 5 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 dts/xtensa/espressif/esp32s3/esp32s3_wroom_n16r2.dtsi
 create mode 100644 dts/xtensa/espressif/esp32s3/esp32s3_wroom_n4r2.dtsi
 create mode 100644 dts/xtensa/espressif/esp32s3/esp32s3_wroom_n8r2.dtsi

diff --git a/dts/xtensa/espressif/esp32s3/esp32s3_wroom_n16r2.dtsi b/dts/xtensa/espressif/esp32s3/esp32s3_wroom_n16r2.dtsi
new file mode 100644
index 00000000000..c4c0929063d
--- /dev/null
+++ b/dts/xtensa/espressif/esp32s3/esp32s3_wroom_n16r2.dtsi
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "esp32s3_common.dtsi"
+
+/* 16MB flash */
+&flash0 {
+	reg = <0x0 DT_SIZE_M(16)>;
+};
+
+/* 2MB psram */
+&psram0 {
+	reg = <0x3c000000 DT_SIZE_M(2)>;
+	status = "okay";
+};
diff --git a/dts/xtensa/espressif/esp32s3/esp32s3_wroom_n4r2.dtsi b/dts/xtensa/espressif/esp32s3/esp32s3_wroom_n4r2.dtsi
new file mode 100644
index 00000000000..b8f733a3c54
--- /dev/null
+++ b/dts/xtensa/espressif/esp32s3/esp32s3_wroom_n4r2.dtsi
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "esp32s3_common.dtsi"
+
+/* 4MB flash */
+&flash0 {
+	reg = <0x0 DT_SIZE_M(4)>;
+};
+
+/* 2MB psram */
+&psram0 {
+	reg = <0x3c000000 DT_SIZE_M(2)>;
+	status = "okay";
+};
diff --git a/dts/xtensa/espressif/esp32s3/esp32s3_wroom_n8r2.dtsi b/dts/xtensa/espressif/esp32s3/esp32s3_wroom_n8r2.dtsi
new file mode 100644
index 00000000000..b77169f172b
--- /dev/null
+++ b/dts/xtensa/espressif/esp32s3/esp32s3_wroom_n8r2.dtsi
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "esp32s3_common.dtsi"
+
+/* 8MB flash */
+&flash0 {
+	reg = <0x0 DT_SIZE_M(8)>;
+};
+
+/* 2MB psram */
+&psram0 {
+	reg = <0x3c000000 DT_SIZE_M(2)>;
+	status = "okay";
+};
diff --git a/dts/xtensa/espressif/esp32s3/esp32s3_wroom_n8r8.dtsi b/dts/xtensa/espressif/esp32s3/esp32s3_wroom_n8r8.dtsi
index eac737e3d61..34ec0ec5ac1 100644
--- a/dts/xtensa/espressif/esp32s3/esp32s3_wroom_n8r8.dtsi
+++ b/dts/xtensa/espressif/esp32s3/esp32s3_wroom_n8r8.dtsi
@@ -14,4 +14,5 @@
 /* 8MB psram */
 &psram0 {
 	reg = <0x3c000000 DT_SIZE_M(8)>;
+	status = "okay";
 };
diff --git a/soc/xtensa/espressif_esp32/esp32s3/Kconfig.soc b/soc/xtensa/espressif_esp32/esp32s3/Kconfig.soc
index b8cc95b62cb..ad8b4b4234b 100644
--- a/soc/xtensa/espressif_esp32/esp32s3/Kconfig.soc
+++ b/soc/xtensa/espressif_esp32/esp32s3/Kconfig.soc
@@ -43,7 +43,13 @@ choice SOC_PART_NUMBER
 	config SOC_ESP32S3_WROOM_N8R8
 		bool "ESP32S3_WROOM_N8R8"
 	config SOC_ESP32S3_WROOM_N16R8
-		bool "ESP32S3_WROOM_N16"
+		bool "ESP32S3_WROOM_N16R8"
+	config SOC_ESP32S3_WROOM_N4R2
+		bool "ESP32S3_WROOM_N4R2"
+	config SOC_ESP32S3_WROOM_N8R2
+		bool "ESP32S3_WROOM_N8R2"
+	config SOC_ESP32S3_WROOM_N16R2
+		bool "ESP32S3_WROOM_N16R2"
 
 endchoice # SOC_PART_NUMBER