WIP: esp32p4: add ESP32-P4 platform support, declarative static topology, and hardware audio pipelines

Kconfig.sof

@@ -60,9 +60,7 @@ rsource "Kconfig.xtos"
 
 rsource "src/Kconfig"
 
-if ZEPHYR_SOF_MODULE
-	rsource "Kconfig.zephyr-log"
-endif
+rsource "Kconfig.zephyr-log"
 
 menu "Debug"
 

app/CMakeLists.txt

@@ -5,11 +5,49 @@ cmake_minimum_required(VERSION 3.21.0)
 find_package(Zephyr HINTS $ENV{ZEPHYR_BASE})
 project(sample_sof)
 
+add_subdirectory(../zephyr sof_zephyr)
+
 target_sources(app PRIVATE
     src/main.c
+    ../src/debug/shell/esp32_shell.c
+  )
+
+target_sources_ifdef(CONFIG_USB_DEVICE_STACK_NEXT app PRIVATE
+    src/usbd_init.c
   )
 
-zephyr_library_include_directories(app PUBLIC
-    ${CMAKE_CURRENT_SOURCE_DIR}/../src/arch/xtensa/include
+target_include_directories(app PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/src
     ${CMAKE_CURRENT_SOURCE_DIR}/../src/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/../zephyr/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/../src/platform/esp32p4/include
+    ${PROJECT_BINARY_DIR}/include/generated
   )
+
+target_link_libraries(app PRIVATE SOF modules_sof)
+if(TARGET uuid_reg_h)
+  add_dependencies(app uuid_reg_h modules_sof)
+endif()
+
+if(CONFIG_XTENSA)
+  target_include_directories(app PRIVATE
+      ${CMAKE_CURRENT_SOURCE_DIR}/../src/arch/xtensa/include
+    )
+endif()
+
+function(sof_append_relative_path_definitions target)
+	get_target_property(sources ${target} SOURCES)
+	foreach(src ${sources})
+		get_filename_component(ABS_PATH ${src} ABSOLUTE)
+		file(RELATIVE_PATH rel ${PROJECT_SOURCE_DIR} ${ABS_PATH})
+		set_property(
+			SOURCE ${src}
+			APPEND
+			PROPERTY COMPILE_DEFINITIONS
+			RELATIVE_FILE="${rel}")
+	endforeach()
+endfunction()
+
+sof_append_relative_path_definitions(app)
+
+

app/Kconfig

@@ -7,6 +7,11 @@ choice COMPILER_CODEGEN_VLIW
 endchoice
 
 source "Kconfig.zephyr"
+source "samples/subsys/usb/common/Kconfig.sample_usbd"
+
+if !ZEPHYR_SOF_MODULE
+rsource "../zephyr/Kconfig"
+endif
 
 if SOC_FAMILY_INTEL_ADSP
 	rsource "boards/intel_adsp/Kconfig.defconfig"

app/boards/esp32p4_function_ev_board_esp32p4_hpcore.conf

@@ -0,0 +1,92 @@
+# Target Platform & SOF Core
+CONFIG_PLATFORM_ESP32P4=y
+CONFIG_SOF_FULL_ZEPHYR_APPLICATION=y
+CONFIG_ZEPHYR_NATIVE_DRIVERS=y
+CONFIG_SYS_HEAP_BIG_ONLY=y
+CONFIG_BUILD_OUTPUT_BIN=y
+
+# Zephyr DAI Drivers for ESP32
+CONFIG_DAI=y
+CONFIG_DAI_ESPRESSIF_I2S=y
+CONFIG_DAI_ESPRESSIF_PDM=y
+CONFIG_PINCTRL=y
+CONFIG_DMA=y
+CONFIG_DMA_ESP32_MAX_DESCRIPTOR_NUM=64
+
+# Audio Processing Modules
+CONFIG_COMP_VOLUME=y
+CONFIG_COMP_IIR=y
+CONFIG_COMP_FIR=y
+CONFIG_COMP_DRC=y
+CONFIG_COMP_CROSSOVER=y
+CONFIG_COMP_DCBLOCK=y
+CONFIG_COMP_MULTIBAND_DRC=y
+CONFIG_COMP_TDFB=y
+CONFIG_COMP_USB_AUDIO=y
+CONFIG_COMP_BT_AUDIO=y
+CONFIG_COMP_TONE=y
+CONFIG_COMP_LEVEL_MULTIPLIER=y
+CONFIG_COMP_SEL=y
+CONFIG_COMP_MUX=y
+CONFIG_COMP_MIXER=y
+CONFIG_FILTER_RISCV_SIMD=y
+CONFIG_DRC_RISCV_SIMD=y
+CONFIG_EQ_IIR_RISCV_SIMD=y
+CONFIG_VOLUME_RISCV_SIMD=y
+
+# USB Device Stack Next & UAC2 Class
+CONFIG_USB_DEVICE_STACK_NEXT=y
+CONFIG_CDC_ACM_SERIAL_INITIALIZE_AT_BOOT=n
+CONFIG_USBD_AUDIO2_CLASS=y
+CONFIG_UDC_ENABLE_SOF=y
+CONFIG_UDC_DWC2_DMA=n
+CONFIG_UDC_DWC2_PTI=y
+CONFIG_UDC_BUF_COUNT=64
+CONFIG_UDC_BUF_POOL_SIZE=16384
+
+# USB Device Identification
+CONFIG_SAMPLE_USBD_VID=0x303A
+CONFIG_SAMPLE_USBD_PID=0x4002
+CONFIG_SAMPLE_USBD_MANUFACTURER="Espressif"
+CONFIG_SAMPLE_USBD_PRODUCT="ESP32-P4 Dual UAC2 Audio"
+
+# System Resources & Memory
+CONFIG_MAIN_STACK_SIZE=4096
+CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096
+CONFIG_USBD_THREAD_STACK_SIZE=4096
+CONFIG_UDC_DWC2_STACK_SIZE=4096
+CONFIG_UDC_WORKQUEUE_STACK_SIZE=4096
+CONFIG_ISR_STACK_SIZE=4096
+CONFIG_HW_STACK_PROTECTION=n
+CONFIG_HEAP_MEM_POOL_SIZE=16384
+CONFIG_TICKLESS_KERNEL=n
+CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000
+
+# Logging & UART Console
+CONFIG_LOG=y
+CONFIG_LOG_DEFAULT_LEVEL=3
+CONFIG_LOG_MAX_LEVEL=4
+CONFIG_SOF_LOG_LEVEL_INF=y
+CONFIG_DAI_LOG_LEVEL_INF=y
+CONFIG_USBD_UAC2_LOG_LEVEL_INF=y
+CONFIG_UDC_DRIVER_LOG_LEVEL_INF=y
+CONFIG_LOG_MODE_DEFERRED=y
+CONFIG_LOG_BUFFER_SIZE=4096
+CONFIG_LOG_MODE_OVERFLOW=y
+CONFIG_LOG_BACKEND_UART=y
+CONFIG_SHELL_LOG_BACKEND=y
+CONFIG_PRINTK=y
+CONFIG_LOG_PRINTK=n
+CONFIG_EARLY_CONSOLE=y
+
+# Interactive Shell
+CONFIG_SHELL=y
+CONFIG_SHELL_STACK_SIZE=8192
+CONFIG_SHELL_BACKENDS=y
+CONFIG_SHELL_BACKEND_SERIAL=y
+CONFIG_SHELL_PROMPT_UART="sof:~$ "
+
+# SOF Low Latency Scheduler Statistics Logging (Every 1s)
+CONFIG_SCHEDULE_LL_STATS_LOG=y
+CONFIG_SCHEDULE_LL_STATS_LOG_EVERY_OTHER_WINDOW=n
+CONFIG_SCHEDULE_LL_STATS_LOG_WINDOW_SIZE=10

app/boards/esp32p4_function_ev_board_esp32p4_hpcore.overlay

@@ -0,0 +1,175 @@
+#include <zephyr/dt-bindings/usb/audio.h>
+#include <zephyr/dt-bindings/pinctrl/esp32p4-pinctrl.h>
+
+/ {
+	chosen {
+		zephyr,console = &uart0;
+		zephyr,shell-uart = &uart0;
+	};
+
+	uac2_card: usb_audio2 {
+		compatible = "zephyr,uac2";
+		status = "okay";
+		full-speed;
+		audio-function = <AUDIO_FUNCTION_IO_BOX>;
+
+		uac_aclk: aclk {
+			compatible = "zephyr,uac2-clock-source";
+			clock-type = "internal-programmable";
+			frequency-control = "host-programmable";
+			sampling-frequencies = <48000>;
+			sof-synchronized;
+		};
+
+		pdm_aclk: pdm_aclk {
+			compatible = "zephyr,uac2-clock-source";
+			clock-type = "internal-programmable";
+			frequency-control = "host-programmable";
+			sampling-frequencies = <48000>;
+			sof-synchronized;
+		};
+
+		/* ===== Playback from Host (ISO OUT) ===== */
+		i2s_out_terminal: i2s_out_terminal {
+			compatible = "zephyr,uac2-input-terminal";
+			clock-source = <&uac_aclk>;
+			terminal-type = <USB_TERMINAL_STREAMING>;
+			front-left;
+			front-right;
+		};
+
+		i2s_fu: i2s_fu {
+			compatible = "zephyr,uac2-feature-unit";
+			data-source = <&i2s_out_terminal>;
+			mute-control = "host-programmable";
+			volume-control = "host-programmable";
+		};
+
+		pb_eq_fu: pb_eq_fu {
+			compatible = "zephyr,uac2-feature-unit";
+			data-source = <&i2s_fu>;
+			mute-control = "host-programmable";
+		};
+
+		pb_drc_fu: pb_drc_fu {
+			compatible = "zephyr,uac2-feature-unit";
+			data-source = <&pb_eq_fu>;
+			mute-control = "host-programmable";
+		};
+
+		i2s_speaker: i2s_speaker {
+			compatible = "zephyr,uac2-output-terminal";
+			data-source = <&pb_drc_fu>;
+			clock-source = <&uac_aclk>;
+			terminal-type = <OUTPUT_TERMINAL_SPEAKER>;
+			assoc-terminal = <&i2s_mic>;
+		};
+
+		/* ===== Capture to Host (ISO IN) ===== */
+		i2s_mic: i2s_mic {
+			compatible = "zephyr,uac2-input-terminal";
+			clock-source = <&uac_aclk>;
+			terminal-type = <INPUT_TERMINAL_MICROPHONE>;
+			front-left;
+			front-right;
+		};
+
+		cap_tdfb_fu: cap_tdfb_fu {
+			compatible = "zephyr,uac2-feature-unit";
+			data-source = <&i2s_mic>;
+			mute-control = "host-programmable";
+		};
+
+		cap_eq_fu: cap_eq_fu {
+			compatible = "zephyr,uac2-feature-unit";
+			data-source = <&cap_tdfb_fu>;
+			mute-control = "host-programmable";
+		};
+
+		i2s_in_fu: i2s_in_fu {
+			compatible = "zephyr,uac2-feature-unit";
+			data-source = <&cap_eq_fu>;
+			mute-control = "host-programmable";
+			volume-control = "host-programmable";
+		};
+
+		i2s_in_terminal: i2s_in_terminal {
+			compatible = "zephyr,uac2-output-terminal";
+			data-source = <&i2s_in_fu>;
+			clock-source = <&uac_aclk>;
+			terminal-type = <USB_TERMINAL_STREAMING>;
+		};
+
+		/* Audio Streaming Interfaces */
+		as_i2s_out: as_i2s_out {
+			compatible = "zephyr,uac2-audio-streaming";
+			linked-terminal = <&i2s_out_terminal>;
+			subslot-size = <2>;
+			bit-resolution = <16>;
+		};
+
+		as_i2s_in: as_i2s_in {
+			compatible = "zephyr,uac2-audio-streaming";
+			linked-terminal = <&i2s_in_terminal>;
+			subslot-size = <2>;
+			bit-resolution = <16>;
+		};
+	};
+
+	/* ESP32 DAI Nodes */
+	dai_i2s0: dai@500c6000 {
+		compatible = "espressif,esp32-dai-i2s";
+		status = "okay";
+		reg = <0x500c6000 0x1000>;
+		interrupt-parent = <&intc>;
+		interrupts = <10 1 0>;
+		dai-index = <0>;
+		pinctrl-0 = <&i2s0_default>;
+		pinctrl-names = "default";
+		fifo-depth = <32>;
+	};
+
+	dai_pdm0: dai@500c7000 {
+		compatible = "espressif,esp32-dai-pdm";
+		status = "okay";
+		reg = <0x500c7000 0x1000>;
+		interrupt-parent = <&intc>;
+		interrupts = <11 1 0>;
+		dai-index = <1>;
+		pinctrl-0 = <&i2s1_default>;
+		pinctrl-names = "default";
+		fifo-depth = <32>;
+	};
+};
+
+&pinctrl {
+	i2s0_default: i2s0_default {
+		group1 {
+			pinmux = <ESP32_PINMUX(21, ESP_I2S0_O_BCK_IN, ESP_I2S0_O_BCK_OUT)>,
+				 <ESP32_PINMUX(22, ESP_I2S0_O_WS_IN, ESP_I2S0_O_WS_OUT)>,
+				 <ESP32_PINMUX(23, ESP_NOSIG, ESP_I2S0_O_SD_OUT)>;
+		};
+		group2 {
+			pinmux = <ESP32_PINMUX(20, ESP_I2S0_I_SD_IN, ESP_NOSIG)>;
+		};
+	};
+
+	i2s1_default: i2s1_default {
+		group1 {
+			pinmux = <ESP32_PINMUX(4, ESP_I2S1_O_BCK_IN, ESP_NOSIG)>,
+				 <ESP32_PINMUX(5, ESP_NOSIG, ESP_I2S1_O_SD_OUT)>,
+				 <ESP32_PINMUX(6, ESP_I2S1_O_WS_IN, ESP_NOSIG)>;
+		};
+		group2 {
+			pinmux = <ESP32_PINMUX(3, ESP_I2S1_I_SD_IN, ESP_NOSIG)>;
+		};
+	};
+};
+
+&spi2 {
+	status = "disabled";
+};
+
+&i2c0 {
+	status = "disabled";
+};