xtensa/esp32s3: Support octal lines mode SPIRAM

Author: donghengqaz

Documentation/platforms/xtensa/esp32s3/boards/esp32s3-devkit/index.rst

@@ -162,6 +162,38 @@ To test it, just run the ``oneshot`` example::
     Waiting...
     Finished
 
+psram_quad
+----------
+
+This config tests the PSRAM driver over SPIRAM interface in quad mode.
+You can use the mm command to test the PSRAM memory::
+
+    nsh> mm
+        mallinfo:
+          Total space allocated from system = 8803232
+          Number of non-inuse chunks        = 2
+          Largest non-inuse chunk           = 8388592
+          Total allocated space             = 9672
+          Total non-inuse space             = 8793560
+    (0)Allocating 5011 bytes
+
+    ......
+
+    (31)Releasing memory at 0x3fc8c088 (size=24 bytes)
+        mallinfo:
+          Total space allocated from system = 8803232
+          Number of non-inuse chunks        = 2
+          Largest non-inuse chunk           = 8388592
+          Total allocated space             = 9672
+          Total non-inuse space             = 8793560
+    TEST COMPLETE
+
+psram_octal
+-----------
+
+Similar to the ```psram_quad``` configuration but using the SPIRAM
+interface in octal mode.
+
 pwm
 ---
 

arch/xtensa/src/esp32s3/Kconfig

@@ -531,6 +531,7 @@ config ESP32S3_SPIRAM_SPEED_80M
 
 config ESP32S3_SPIRAM_SPEED_120M
 	bool "120MHz clock speed"
+	depends on ESP32S3_SPIRAM_MODE_QUAD
 
 endchoice # ESP32S3_SPIRAM_SPEED
 
@@ -1017,6 +1018,9 @@ choice ESP32S3_FLASH_MODE
 	config ESP32S3_FLASH_MODE_QOUT
 		bool "Quad Output (QOUT)"
 
+	config ESP32S3_FLASH_MODE_OCT
+		bool "Octal"
+
 endchoice # ESP32S3_FLASH_MODE
 
 choice ESP32S3_FLASH_FREQ
@@ -1039,6 +1043,25 @@ choice ESP32S3_FLASH_FREQ
 
 endchoice # ESP32S3_FLASH_FREQ
 
+config ESP32S3_FLASH_FREQ
+	int
+	default 120 if ESP32S3_FLASH_FREQ_120M
+	default 80 if ESP32S3_FLASH_FREQ_80M
+	default 40 if ESP32S3_FLASH_FREQ_40M
+	default 20 if ESP32S3_FLASH_FREQ_20M
+
+choice ESP32S3_FLASH_SAMPLE_MODE
+	prompt "Flash Sampling Mode"
+	default ESP32S3_FLASH_SAMPLE_MODE_DTR if ESP32S3_FLASH_MODE_OCT
+	default ESP32S3_FLASH_SAMPLE_MODE_STR if !ESP32S3_FLASH_MODE_OCT
+
+	config ESP32S3_FLASH_SAMPLE_MODE_DTR
+		depends on ESP32S3_FLASH_MODE_OCT
+		bool "DTR Mode"
+	config ESP32S3_FLASH_SAMPLE_MODE_STR
+		bool "STR Mode"
+endchoice
+
 config ESP32S3_HAVE_OTA_PARTITION
 	bool
 	default n

arch/xtensa/src/esp32s3/Make.defs

@@ -30,7 +30,7 @@ HEAD_CSRC  = esp32s3_start.c
 CHIP_CSRCS  = esp32s3_irq.c esp32s3_clockconfig.c esp32s3_region.c
 CHIP_CSRCS += esp32s3_systemreset.c esp32s3_user.c esp32s3_allocateheap.c
 CHIP_CSRCS += esp32s3_wdt.c esp32s3_gpio.c esp32s3_lowputc.c esp32s3_serial.c
-CHIP_CSRCS += esp32s3_rtc_gpio.c esp32s3_libc_stubs.c
+CHIP_CSRCS += esp32s3_rtc_gpio.c esp32s3_libc_stubs.c esp32s3_spi_timing.c
 
 # Configuration-dependent ESP32-S3 files
 
@@ -118,7 +118,14 @@ endif
 
 ifeq ($(CONFIG_ESP32S3_SPIRAM),y)
 CHIP_CSRCS += esp32s3_spiram.c
-CHIP_CSRCS += esp32s3_psram.c
+
+ifeq ($(CONFIG_ESP32S3_SPIRAM_MODE_QUAD),y)
+CHIP_CSRCS += esp32s3_psram_quad.c
+endif
+
+ifeq ($(CONFIG_ESP32S3_SPIRAM_MODE_OCT),y)
+CHIP_CSRCS += esp32s3_psram_octal.c
+endif
 endif
 
 ifeq ($(CONFIG_ESP32S3_TOUCH),y)

arch/xtensa/src/esp32s3/esp32s3_allocateheap.c

@@ -38,6 +38,9 @@
 
 #include "xtensa.h"
 #include "hardware/esp32s3_rom_layout.h"
+#ifdef CONFIG_ESP32S3_SPIRAM
+#  include "esp32s3_spiram.h"
+#endif
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -154,5 +157,14 @@ void up_allocate_kheap(void **heap_start, size_t *heap_size)
 #if CONFIG_MM_REGIONS > 1
 void xtensa_add_region(void)
 {
+#ifdef CONFIG_ESP32S3_SPIRAM
+  void  *start;
+  size_t size;
+
+  start = (void *)esp_spiram_allocable_vaddr_start();
+  size  = (size_t)(esp_spiram_allocable_vaddr_end() -
+                   esp_spiram_allocable_vaddr_start());
+  umm_addregion(start, size);
+#endif
 }
 #endif