Merge branch 'refactor/bitscrambler_in_esp_hal_dma_v6.0' into 'release/v6.0'

refactor(hal): bitscrambler hal -> esp_hal_dma, usj hal -> esp_hal_usb (v6.0)

See merge request espressif/esp-idf!43700

Author: suda-morris

components/esp_driver_bitscrambler/CMakeLists.txt

@@ -10,6 +10,7 @@ if(CONFIG_SOC_BITSCRAMBLER_SUPPORTED)
 endif()
 
 idf_component_register(SRCS ${srcs}
+                       REQUIRES "esp_hal_dma"
                        PRIV_REQUIRES "esp_mm"
                        INCLUDE_DIRS "include"
                        LDFRAGMENTS "linker.lf")

components/esp_driver_bitscrambler/include/driver/bitscrambler.h

@@ -9,9 +9,6 @@
 #include "esp_err.h"
 #include "soc/soc_caps.h"
 #include "hal/bitscrambler_types.h"
-#if SOC_BITSCRAMBLER_SUPPORTED
-#include "soc/bitscrambler_peri_select.h"
-#endif
 
 #ifdef __cplusplus
 extern "C" {

components/esp_driver_bitscrambler/src/bitscrambler_esp32c5.c

@@ -3,11 +3,10 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include "soc/gdma_channel.h"
+#include "hal/gdma_channel.h"
 #include "bitscrambler_soc_specific.h"
 
-// Note: these are indexed by the values of the SOC_BITSCRAMBLER_ATTACH_ defines
-// in soc/bitscrambler_peri_select.h
+// Note: these are indexed by the values of the SOC_BITSCRAMBLER_ATTACH_ defines in bitscrambler_peri_select.h
 // This map is used by the bitscrambler loopback driver only.
 
 const bitscrambler_periph_desc_t g_bitscrambler_periph_desc[] = {

components/esp_driver_bitscrambler/src/bitscrambler_esp32p4.c

@@ -3,11 +3,10 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include "soc/gdma_channel.h"
+#include "hal/gdma_channel.h"
 #include "bitscrambler_soc_specific.h"
 
-// Note: these are indexed by the values of the SOC_BITSCRAMBLER_ATTACH_ defines
-// in soc/bitscrambler_peri_select.h
+// Note: these are indexed by the values of the SOC_BITSCRAMBLER_ATTACH_ defines in bitscrambler_peri_select.h
 // This map is used by the bitscrambler loopback driver only.
 
 const bitscrambler_periph_desc_t g_bitscrambler_periph_desc[] = {

components/esp_driver_bitscrambler/src/bitscrambler_soc_specific.h

@@ -6,7 +6,7 @@
 #pragma once
 
 #include "esp_private/gdma.h"
-#include "soc/bitscrambler_peri_select.h"
+#include "hal/bitscrambler_peri_select.h"
 
 #ifdef __cplusplus
 extern "C" {

components/esp_driver_bitscrambler/test_apps/.build-test-rules.yml

@@ -3,3 +3,4 @@ components/esp_driver_bitscrambler/test_apps/bitscrambler:
     - if: SOC_BITSCRAMBLER_SUPPORTED != 1
   depends_components:
     - esp_driver_bitscrambler
+    - esp_hal_dma

components/esp_driver_parlio/src/parlio_priv.h

@@ -27,7 +27,6 @@
 #include "freertos/queue.h"
 #include "freertos/idf_additions.h"
 #include "soc/soc_caps.h"
-#include "soc/gdma_channel.h"
 #include "soc/parlio_periph.h"
 #include "hal/parlio_types.h"
 #include "hal/parlio_hal.h"

components/esp_driver_rmt/src/rmt_private.h

@@ -26,7 +26,6 @@
 #include "esp_check.h"
 #include "esp_err.h"
 #include "soc/soc_caps.h"
-#include "soc/gdma_channel.h"
 #include "soc/rmt_periph.h"
 #include "hal/rmt_types.h"
 #include "hal/rmt_hal.h"

components/esp_driver_usb_serial_jtag/CMakeLists.txt

@@ -12,7 +12,7 @@ endif()
 if(${target} STREQUAL "linux")
     set(priv_requires esp_ringbuf esp_timer)
 else()
-    set(priv_requires esp_driver_gpio esp_ringbuf esp_pm esp_timer)
+    set(priv_requires esp_driver_gpio esp_ringbuf esp_pm esp_timer esp_hal_usb)
 endif()
 
 idf_component_register(SRCS ${srcs}

components/esp_driver_usb_serial_jtag/test_apps/.build-test-rules.yml

@@ -14,6 +14,7 @@ components/esp_driver_usb_serial_jtag/test_apps/usb_serial_jtag:
     - vfs
     - esp_driver_gpio
     - esp_driver_usb_serial_jtag
+    - esp_hal_usb
 
 components/esp_driver_usb_serial_jtag/test_apps/usb_serial_jtag_vfs:
   disable:
@@ -28,3 +29,4 @@ components/esp_driver_usb_serial_jtag/test_apps/usb_serial_jtag_vfs:
   depends_components:
     - vfs
     - esp_driver_usb_serial_jtag
+    - esp_hal_usb