From cd48baf979a0a9eca56e6f742427fcf060e12971 Mon Sep 17 00:00:00 2001 From: Omar Chebib Date: Fri, 24 Jun 2022 12:12:33 +0800 Subject: [PATCH] Refactor: move regi2c_*.h header files from esp_hw_support to soc component When creating G0 layer, some regi2c_*.h headers were moved out from esp_hw_support (G1) to soc (G0). In order to be consistent with that change, move all the remaining regi2c_*.h headers to soc too. --- .../src/esp32c3/bootloader_esp32c3.c | 4 +- .../esp_hw_support/port/esp32c2/rtc_init.c | 4 +- .../esp_hw_support/port/esp32c2/rtc_sleep.c | 4 +- .../esp_hw_support/port/esp32c3/rtc_init.c | 4 +- .../esp_hw_support/port/esp32c3/rtc_sleep.c | 4 +- .../esp_hw_support/port/esp32h2/rtc_sleep.c | 4 +- .../esp_hw_support/port/esp32s2/rtc_init.c | 2 +- .../esp_hw_support/port/esp32s3/rtc_clk.c | 2 +- .../esp_hw_support/port/esp32s3/rtc_init.c | 6 +- .../esp_hw_support/port/esp32s3/rtc_sleep.c | 2 +- .../hal/esp32/include/hal/clk_tree_ll.h | 6 +- .../hal/esp32c2/include/hal/clk_tree_ll.h | 4 +- .../include/hal/temperature_sensor_ll.h | 2 +- .../hal/esp32c3/include/hal/clk_tree_ll.h | 4 +- .../include/hal/temperature_sensor_ll.h | 2 +- .../hal/esp32h2/include/hal/clk_tree_ll.h | 4 +- .../include/hal/temperature_sensor_ll.h | 2 +- .../hal/esp32s2/include/hal/clk_tree_ll.h | 6 +- .../include/hal/temperature_sensor_ll.h | 2 +- .../hal/esp32s3/include/hal/clk_tree_ll.h | 4 +- .../include/hal/temperature_sensor_ll.h | 2 +- .../esp32/include/soc}/regi2c_apll.h | 0 .../esp32/include/soc}/regi2c_bbpll.h | 0 components/soc/esp32c2/i2c_bbpll.h | 175 ----------------- .../esp32c2/include/soc}/regi2c_bbpll.h | 0 .../esp32c2/include/soc}/regi2c_bias.h | 0 .../esp32c2/include/soc}/regi2c_dig_reg.h | 0 .../esp32c2/include/soc}/regi2c_lp_bias.h | 0 components/soc/esp32c3/i2c_bbpll.h | 183 ------------------ .../esp32c3/include/soc}/regi2c_bbpll.h | 0 .../esp32c3/include/soc}/regi2c_bias.h | 0 .../esp32c3/include/soc}/regi2c_dig_reg.h | 0 .../esp32c3/include/soc}/regi2c_lp_bias.h | 0 components/soc/esp32h2/i2c_bbpll.h | 120 ------------ .../esp32h2/include/soc}/regi2c_bbpll.h | 0 .../esp32h2/include/soc}/regi2c_bias.h | 0 .../esp32h2/include/soc}/regi2c_dig_reg.h | 0 .../esp32h2/include/soc}/regi2c_lp_bias.h | 0 .../esp32h2/include/soc}/regi2c_pmu.h | 0 .../esp32h2/include/soc}/regi2c_ulp.h | 0 .../esp32s2/include/soc}/regi2c_apll.h | 0 .../esp32s2/include/soc}/regi2c_bbpll.h | 0 .../esp32s2/include/soc}/regi2c_ulp.h | 0 .../esp32s3/include/soc}/regi2c_bbpll.h | 0 .../esp32s3/include/soc}/regi2c_dig_reg.h | 0 .../esp32s3/include/soc}/regi2c_lp_bias.h | 0 .../esp32s3/include/soc}/regi2c_ulp.h | 0 47 files changed, 37 insertions(+), 515 deletions(-) rename components/{esp_hw_support/port/esp32/private_include => soc/esp32/include/soc}/regi2c_apll.h (100%) rename components/{esp_hw_support/port/esp32/private_include => soc/esp32/include/soc}/regi2c_bbpll.h (100%) delete mode 100644 components/soc/esp32c2/i2c_bbpll.h rename components/{esp_hw_support/port/esp32c2/private_include => soc/esp32c2/include/soc}/regi2c_bbpll.h (100%) rename components/{esp_hw_support/port/esp32c2/private_include => soc/esp32c2/include/soc}/regi2c_bias.h (100%) rename components/{esp_hw_support/port/esp32c2/private_include => soc/esp32c2/include/soc}/regi2c_dig_reg.h (100%) rename components/{esp_hw_support/port/esp32c2/private_include => soc/esp32c2/include/soc}/regi2c_lp_bias.h (100%) delete mode 100644 components/soc/esp32c3/i2c_bbpll.h rename components/{esp_hw_support/port/esp32c3/private_include => soc/esp32c3/include/soc}/regi2c_bbpll.h (100%) rename components/{esp_hw_support/port/esp32c3/private_include => soc/esp32c3/include/soc}/regi2c_bias.h (100%) rename components/{esp_hw_support/port/esp32c3/private_include => soc/esp32c3/include/soc}/regi2c_dig_reg.h (100%) rename components/{esp_hw_support/port/esp32c3/private_include => soc/esp32c3/include/soc}/regi2c_lp_bias.h (100%) delete mode 100644 components/soc/esp32h2/i2c_bbpll.h rename components/{esp_hw_support/port/esp32h2/private_include => soc/esp32h2/include/soc}/regi2c_bbpll.h (100%) rename components/{esp_hw_support/port/esp32h2/private_include => soc/esp32h2/include/soc}/regi2c_bias.h (100%) rename components/{esp_hw_support/port/esp32h2/private_include => soc/esp32h2/include/soc}/regi2c_dig_reg.h (100%) rename components/{esp_hw_support/port/esp32h2/private_include => soc/esp32h2/include/soc}/regi2c_lp_bias.h (100%) rename components/{esp_hw_support/port/esp32h2/private_include => soc/esp32h2/include/soc}/regi2c_pmu.h (100%) rename components/{esp_hw_support/port/esp32h2/private_include => soc/esp32h2/include/soc}/regi2c_ulp.h (100%) rename components/{esp_hw_support/port/esp32s2/private_include => soc/esp32s2/include/soc}/regi2c_apll.h (100%) rename components/{esp_hw_support/port/esp32s2/private_include => soc/esp32s2/include/soc}/regi2c_bbpll.h (100%) rename components/{esp_hw_support/port/esp32s2/private_include => soc/esp32s2/include/soc}/regi2c_ulp.h (100%) rename components/{esp_hw_support/port/esp32s3/private_include => soc/esp32s3/include/soc}/regi2c_bbpll.h (100%) rename components/{esp_hw_support/port/esp32s3/private_include => soc/esp32s3/include/soc}/regi2c_dig_reg.h (100%) rename components/{esp_hw_support/port/esp32s3/private_include => soc/esp32s3/include/soc}/regi2c_lp_bias.h (100%) rename components/{esp_hw_support/port/esp32s3/private_include => soc/esp32s3/include/soc}/regi2c_ulp.h (100%) diff --git a/components/bootloader_support/src/esp32c3/bootloader_esp32c3.c b/components/bootloader_support/src/esp32c3/bootloader_esp32c3.c index 6c6e98877e..ad951faa1c 100644 --- a/components/bootloader_support/src/esp32c3/bootloader_esp32c3.c +++ b/components/bootloader_support/src/esp32c3/bootloader_esp32c3.c @@ -32,8 +32,8 @@ #include "bootloader_flash_config.h" #include "bootloader_mem.h" #include "esp_private/regi2c_ctrl.h" -#include "regi2c_lp_bias.h" -#include "regi2c_bias.h" +#include "soc/regi2c_lp_bias.h" +#include "soc/regi2c_bias.h" #include "bootloader_console.h" #include "bootloader_flash_priv.h" #include "bootloader_soc.h" diff --git a/components/esp_hw_support/port/esp32c2/rtc_init.c b/components/esp_hw_support/port/esp32c2/rtc_init.c index 9d3219c5b6..80ccb0abb7 100644 --- a/components/esp_hw_support/port/esp32c2/rtc_init.c +++ b/components/esp_hw_support/port/esp32c2/rtc_init.c @@ -15,8 +15,8 @@ #include "soc/extmem_reg.h" #include "soc/system_reg.h" #include "regi2c_ctrl.h" -#include "regi2c_dig_reg.h" -#include "regi2c_lp_bias.h" +#include "soc/regi2c_dig_reg.h" +#include "soc/regi2c_lp_bias.h" #include "esp_hw_log.h" #include "esp_efuse.h" #include "esp_efuse_table.h" diff --git a/components/esp_hw_support/port/esp32c2/rtc_sleep.c b/components/esp_hw_support/port/esp32c2/rtc_sleep.c index a64f411d6b..50ccd67bc7 100644 --- a/components/esp_hw_support/port/esp32c2/rtc_sleep.c +++ b/components/esp_hw_support/port/esp32c2/rtc_sleep.c @@ -18,8 +18,8 @@ #include "esp32c2/rom/ets_sys.h" #include "esp32c2/rom/rtc.h" #include "regi2c_ctrl.h" -#include "regi2c_lp_bias.h" -#include "regi2c_dig_reg.h" +#include "soc/regi2c_lp_bias.h" +#include "soc/regi2c_dig_reg.h" #include "esp_efuse.h" /** diff --git a/components/esp_hw_support/port/esp32c3/rtc_init.c b/components/esp_hw_support/port/esp32c3/rtc_init.c index 50b8f6c207..a218f70365 100644 --- a/components/esp_hw_support/port/esp32c3/rtc_init.c +++ b/components/esp_hw_support/port/esp32c3/rtc_init.c @@ -15,8 +15,8 @@ #include "soc/extmem_reg.h" #include "soc/system_reg.h" #include "regi2c_ctrl.h" -#include "regi2c_dig_reg.h" -#include "regi2c_lp_bias.h" +#include "soc/regi2c_dig_reg.h" +#include "soc/regi2c_lp_bias.h" #include "esp_hw_log.h" #include "esp_efuse.h" #include "esp_efuse_table.h" diff --git a/components/esp_hw_support/port/esp32c3/rtc_sleep.c b/components/esp_hw_support/port/esp32c3/rtc_sleep.c index 079f7f4854..eca2c8e684 100644 --- a/components/esp_hw_support/port/esp32c3/rtc_sleep.c +++ b/components/esp_hw_support/port/esp32c3/rtc_sleep.c @@ -19,8 +19,8 @@ #include "esp32c3/rom/ets_sys.h" #include "esp32c3/rom/rtc.h" #include "regi2c_ctrl.h" -#include "regi2c_dig_reg.h" -#include "regi2c_lp_bias.h" +#include "soc/regi2c_dig_reg.h" +#include "soc/regi2c_lp_bias.h" #include "esp_efuse.h" /** diff --git a/components/esp_hw_support/port/esp32h2/rtc_sleep.c b/components/esp_hw_support/port/esp32h2/rtc_sleep.c index fce6a51768..7f2a6522d5 100644 --- a/components/esp_hw_support/port/esp32h2/rtc_sleep.c +++ b/components/esp_hw_support/port/esp32h2/rtc_sleep.c @@ -19,8 +19,8 @@ #include "esp32h2/rom/ets_sys.h" #include "esp32h2/rom/rtc.h" #include "regi2c_ctrl.h" -#include "regi2c_bias.h" -#include "regi2c_ulp.h" +#include "soc/regi2c_bias.h" +#include "soc/regi2c_ulp.h" #include "esp_efuse.h" #include "i2c_pmu.h" #include "esp_hw_log.h" diff --git a/components/esp_hw_support/port/esp32s2/rtc_init.c b/components/esp_hw_support/port/esp32s2/rtc_init.c index e71d831d0f..59ed07bb74 100644 --- a/components/esp_hw_support/port/esp32s2/rtc_init.c +++ b/components/esp_hw_support/port/esp32s2/rtc_init.c @@ -13,7 +13,7 @@ #include "soc/gpio_reg.h" #include "soc/spi_mem_reg.h" #include "soc/extmem_reg.h" -#include "regi2c_ulp.h" +#include "soc/regi2c_ulp.h" #include "regi2c_ctrl.h" #include "esp_hw_log.h" #include "esp_efuse.h" diff --git a/components/esp_hw_support/port/esp32s3/rtc_clk.c b/components/esp_hw_support/port/esp32s3/rtc_clk.c index b8b2558202..39c33ec6ec 100644 --- a/components/esp_hw_support/port/esp32s3/rtc_clk.c +++ b/components/esp_hw_support/port/esp32s3/rtc_clk.c @@ -20,7 +20,7 @@ #include "hal/clk_tree_ll.h" #include "hal/regi2c_ctrl_ll.h" #include "esp_private/regi2c_ctrl.h" -#include "regi2c_dig_reg.h" +#include "soc/regi2c_dig_reg.h" #include "sdkconfig.h" static const char *TAG = "rtc_clk"; diff --git a/components/esp_hw_support/port/esp32s3/rtc_init.c b/components/esp_hw_support/port/esp32s3/rtc_init.c index d9bbbb976b..18635fda1a 100644 --- a/components/esp_hw_support/port/esp32s3/rtc_init.c +++ b/components/esp_hw_support/port/esp32s3/rtc_init.c @@ -15,9 +15,9 @@ #include "soc/extmem_reg.h" #include "soc/syscon_reg.h" #include "regi2c_ctrl.h" -#include "regi2c_lp_bias.h" -#include "regi2c_ulp.h" -#include "regi2c_dig_reg.h" +#include "soc/regi2c_lp_bias.h" +#include "soc/regi2c_ulp.h" +#include "soc/regi2c_dig_reg.h" #include "esp_hw_log.h" #include "esp_err.h" #include "esp_attr.h" diff --git a/components/esp_hw_support/port/esp32s3/rtc_sleep.c b/components/esp_hw_support/port/esp32s3/rtc_sleep.c index 5ddd0665fc..14d3cf3876 100644 --- a/components/esp_hw_support/port/esp32s3/rtc_sleep.c +++ b/components/esp_hw_support/port/esp32s3/rtc_sleep.c @@ -16,7 +16,7 @@ #include "soc/nrx_reg.h" #include "soc/fe_reg.h" #include "regi2c_ctrl.h" -#include "regi2c_dig_reg.h" +#include "soc/regi2c_dig_reg.h" #define RTC_CNTL_MEM_FOLW_CPU (RTC_CNTL_SLOWMEM_FOLW_CPU | RTC_CNTL_FASTMEM_FOLW_CPU) diff --git a/components/hal/esp32/include/hal/clk_tree_ll.h b/components/hal/esp32/include/hal/clk_tree_ll.h index a5d6fc631e..ea2336fc76 100644 --- a/components/hal/esp32/include/hal/clk_tree_ll.h +++ b/components/hal/esp32/include/hal/clk_tree_ll.h @@ -14,9 +14,9 @@ #include "soc/rtc_io_reg.h" #include "soc/dport_reg.h" #include "soc/syscon_reg.h" -#include "esp_private/regi2c_ctrl.h" -#include "regi2c_bbpll.h" -#include "regi2c_apll.h" +#include "hal/regi2c_ctrl.h" +#include "soc/regi2c_bbpll.h" +#include "soc/regi2c_apll.h" #include "hal/assert.h" #include "esp32/rom/rtc.h" diff --git a/components/hal/esp32c2/include/hal/clk_tree_ll.h b/components/hal/esp32c2/include/hal/clk_tree_ll.h index f753b9b349..88e0fdfc4e 100644 --- a/components/hal/esp32c2/include/hal/clk_tree_ll.h +++ b/components/hal/esp32c2/include/hal/clk_tree_ll.h @@ -12,8 +12,8 @@ #include "soc/rtc.h" #include "soc/system_reg.h" #include "soc/rtc_cntl_reg.h" -#include "esp_private/regi2c_ctrl.h" -#include "regi2c_bbpll.h" +#include "hal/regi2c_ctrl.h" +#include "soc/regi2c_bbpll.h" #include "hal/assert.h" #include "hal/log.h" #include "esp32c2/rom/rtc.h" diff --git a/components/hal/esp32c2/include/hal/temperature_sensor_ll.h b/components/hal/esp32c2/include/hal/temperature_sensor_ll.h index 99eef9a7c1..360f8dfd85 100644 --- a/components/hal/esp32c2/include/hal/temperature_sensor_ll.h +++ b/components/hal/esp32c2/include/hal/temperature_sensor_ll.h @@ -16,7 +16,7 @@ #include #include -#include "esp_private/regi2c_ctrl.h" +#include "hal/regi2c_ctrl.h" #include "soc/regi2c_saradc.h" #include "soc/apb_saradc_struct.h" #include "soc/soc.h" diff --git a/components/hal/esp32c3/include/hal/clk_tree_ll.h b/components/hal/esp32c3/include/hal/clk_tree_ll.h index e80ba7157b..8661952691 100644 --- a/components/hal/esp32c3/include/hal/clk_tree_ll.h +++ b/components/hal/esp32c3/include/hal/clk_tree_ll.h @@ -12,8 +12,8 @@ #include "soc/rtc.h" #include "soc/system_reg.h" #include "soc/rtc_cntl_reg.h" -#include "esp_private/regi2c_ctrl.h" -#include "regi2c_bbpll.h" +#include "hal/regi2c_ctrl.h" +#include "soc/regi2c_bbpll.h" #include "hal/assert.h" #include "hal/log.h" #include "esp32c3/rom/rtc.h" diff --git a/components/hal/esp32c3/include/hal/temperature_sensor_ll.h b/components/hal/esp32c3/include/hal/temperature_sensor_ll.h index a98461b13e..31a47d96f0 100644 --- a/components/hal/esp32c3/include/hal/temperature_sensor_ll.h +++ b/components/hal/esp32c3/include/hal/temperature_sensor_ll.h @@ -16,7 +16,7 @@ #include #include -#include "esp_private/regi2c_ctrl.h" +#include "hal/regi2c_ctrl.h" #include "soc/regi2c_saradc.h" #include "soc/apb_saradc_struct.h" #include "soc/soc.h" diff --git a/components/hal/esp32h2/include/hal/clk_tree_ll.h b/components/hal/esp32h2/include/hal/clk_tree_ll.h index 2c2c4295ec..1ce828145e 100644 --- a/components/hal/esp32h2/include/hal/clk_tree_ll.h +++ b/components/hal/esp32h2/include/hal/clk_tree_ll.h @@ -12,8 +12,8 @@ #include "soc/system_reg.h" #include "soc/clkrst_reg.h" #include "soc/rtc_cntl_reg.h" -#include "esp_private/regi2c_ctrl.h" -#include "regi2c_bbpll.h" +#include "hal/regi2c_ctrl.h" +#include "soc/regi2c_bbpll.h" #include "hal/assert.h" #include "hal/log.h" #include "esp32h2/rom/rtc.h" diff --git a/components/hal/esp32h2/include/hal/temperature_sensor_ll.h b/components/hal/esp32h2/include/hal/temperature_sensor_ll.h index d671e1588c..003db3c114 100644 --- a/components/hal/esp32h2/include/hal/temperature_sensor_ll.h +++ b/components/hal/esp32h2/include/hal/temperature_sensor_ll.h @@ -16,7 +16,7 @@ #include #include -#include "esp_private/regi2c_ctrl.h" +#include "hal/regi2c_ctrl.h" #include "soc/regi2c_saradc.h" #include "soc/apb_saradc_struct.h" #include "soc/soc.h" diff --git a/components/hal/esp32s2/include/hal/clk_tree_ll.h b/components/hal/esp32s2/include/hal/clk_tree_ll.h index d6d60c3254..716f205806 100644 --- a/components/hal/esp32s2/include/hal/clk_tree_ll.h +++ b/components/hal/esp32s2/include/hal/clk_tree_ll.h @@ -13,9 +13,9 @@ #include "soc/rtc_cntl_reg.h" #include "soc/dport_reg.h" #include "soc/syscon_reg.h" -#include "esp_private/regi2c_ctrl.h" -#include "regi2c_bbpll.h" -#include "regi2c_apll.h" +#include "hal/regi2c_ctrl.h" +#include "soc/regi2c_bbpll.h" +#include "soc/regi2c_apll.h" #include "hal/assert.h" #include "esp32s2/rom/rtc.h" diff --git a/components/hal/esp32s2/include/hal/temperature_sensor_ll.h b/components/hal/esp32s2/include/hal/temperature_sensor_ll.h index 420a694c4f..a02805dbc3 100644 --- a/components/hal/esp32s2/include/hal/temperature_sensor_ll.h +++ b/components/hal/esp32s2/include/hal/temperature_sensor_ll.h @@ -15,7 +15,7 @@ #pragma once #include -#include "esp_private/regi2c_ctrl.h" +#include "hal/regi2c_ctrl.h" #include "soc/regi2c_saradc.h" #include "soc/apb_saradc_struct.h" #include "soc/rtc_cntl_reg.h" diff --git a/components/hal/esp32s3/include/hal/clk_tree_ll.h b/components/hal/esp32s3/include/hal/clk_tree_ll.h index 3aa8ec78f9..c62334c8c8 100644 --- a/components/hal/esp32s3/include/hal/clk_tree_ll.h +++ b/components/hal/esp32s3/include/hal/clk_tree_ll.h @@ -12,8 +12,8 @@ #include "soc/rtc.h" #include "soc/system_reg.h" #include "soc/rtc_cntl_reg.h" -#include "esp_private/regi2c_ctrl.h" -#include "regi2c_bbpll.h" +#include "hal/regi2c_ctrl.h" +#include "soc/regi2c_bbpll.h" #include "hal/assert.h" #include "hal/log.h" #include "esp32s3/rom/rtc.h" diff --git a/components/hal/esp32s3/include/hal/temperature_sensor_ll.h b/components/hal/esp32s3/include/hal/temperature_sensor_ll.h index 3edea92f8b..c1fcb073b9 100644 --- a/components/hal/esp32s3/include/hal/temperature_sensor_ll.h +++ b/components/hal/esp32s3/include/hal/temperature_sensor_ll.h @@ -15,7 +15,7 @@ #pragma once #include -#include "esp_private/regi2c_ctrl.h" +#include "hal/regi2c_ctrl.h" #include "soc/regi2c_saradc.h" #include "soc/apb_saradc_struct.h" #include "soc/rtc_cntl_reg.h" diff --git a/components/esp_hw_support/port/esp32/private_include/regi2c_apll.h b/components/soc/esp32/include/soc/regi2c_apll.h similarity index 100% rename from components/esp_hw_support/port/esp32/private_include/regi2c_apll.h rename to components/soc/esp32/include/soc/regi2c_apll.h diff --git a/components/esp_hw_support/port/esp32/private_include/regi2c_bbpll.h b/components/soc/esp32/include/soc/regi2c_bbpll.h similarity index 100% rename from components/esp_hw_support/port/esp32/private_include/regi2c_bbpll.h rename to components/soc/esp32/include/soc/regi2c_bbpll.h diff --git a/components/soc/esp32c2/i2c_bbpll.h b/components/soc/esp32c2/i2c_bbpll.h deleted file mode 100644 index cf24f090a4..0000000000 --- a/components/soc/esp32c2/i2c_bbpll.h +++ /dev/null @@ -1,175 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#pragma once - -/** - * @file i2c_apll.h - * @brief Register definitions for digital PLL (BBPLL) - * - * This file lists register fields of BBPLL, located on an internal configuration - * bus. These definitions are used via macros defined in i2c_rtc_clk.h, by - * rtc_clk_cpu_freq_set function in rtc_clk.c. - */ - -#define I2C_BBPLL 0x66 -#define I2C_BBPLL_HOSTID 1 - -#define I2C_BBPLL_IR_CAL_DELAY 0 -#define I2C_BBPLL_IR_CAL_DELAY_MSB 3 -#define I2C_BBPLL_IR_CAL_DELAY_LSB 0 - -#define I2C_BBPLL_IR_CAL_CK_DIV 0 -#define I2C_BBPLL_IR_CAL_CK_DIV_MSB 7 -#define I2C_BBPLL_IR_CAL_CK_DIV_LSB 4 - -#define I2C_BBPLL_IR_CAL_EXT_CAP 1 -#define I2C_BBPLL_IR_CAL_EXT_CAP_MSB 3 -#define I2C_BBPLL_IR_CAL_EXT_CAP_LSB 0 - -#define I2C_BBPLL_IR_CAL_ENX_CAP 1 -#define I2C_BBPLL_IR_CAL_ENX_CAP_MSB 4 -#define I2C_BBPLL_IR_CAL_ENX_CAP_LSB 4 - -#define I2C_BBPLL_IR_CAL_RSTB 1 -#define I2C_BBPLL_IR_CAL_RSTB_MSB 5 -#define I2C_BBPLL_IR_CAL_RSTB_LSB 5 - -#define I2C_BBPLL_IR_CAL_START 1 -#define I2C_BBPLL_IR_CAL_START_MSB 6 -#define I2C_BBPLL_IR_CAL_START_LSB 6 - -#define I2C_BBPLL_IR_CAL_UNSTOP 1 -#define I2C_BBPLL_IR_CAL_UNSTOP_MSB 7 -#define I2C_BBPLL_IR_CAL_UNSTOP_LSB 7 - -#define I2C_BBPLL_OC_REF_DIV 2 -#define I2C_BBPLL_OC_REF_DIV_MSB 3 -#define I2C_BBPLL_OC_REF_DIV_LSB 0 - -#define I2C_BBPLL_OC_DCHGP 2 -#define I2C_BBPLL_OC_DCHGP_MSB 6 -#define I2C_BBPLL_OC_DCHGP_LSB 4 - -#define I2C_BBPLL_OC_ENB_FCAL 2 -#define I2C_BBPLL_OC_ENB_FCAL_MSB 7 -#define I2C_BBPLL_OC_ENB_FCAL_LSB 7 - -#define I2C_BBPLL_OC_DIV_7_0 3 -#define I2C_BBPLL_OC_DIV_7_0_MSB 7 -#define I2C_BBPLL_OC_DIV_7_0_LSB 0 - -#define I2C_BBPLL_RSTB_DIV_ADC 4 -#define I2C_BBPLL_RSTB_DIV_ADC_MSB 0 -#define I2C_BBPLL_RSTB_DIV_ADC_LSB 0 - -#define I2C_BBPLL_MODE_HF 4 -#define I2C_BBPLL_MODE_HF_MSB 1 -#define I2C_BBPLL_MODE_HF_LSB 1 - -#define I2C_BBPLL_DIV_ADC 4 -#define I2C_BBPLL_DIV_ADC_MSB 3 -#define I2C_BBPLL_DIV_ADC_LSB 2 - -#define I2C_BBPLL_DIV_DAC 4 -#define I2C_BBPLL_DIV_DAC_MSB 4 -#define I2C_BBPLL_DIV_DAC_LSB 4 - -#define I2C_BBPLL_DIV_CPU 4 -#define I2C_BBPLL_DIV_CPU_MSB 5 -#define I2C_BBPLL_DIV_CPU_LSB 5 - -#define I2C_BBPLL_OC_ENB_VCON 4 -#define I2C_BBPLL_OC_ENB_VCON_MSB 6 -#define I2C_BBPLL_OC_ENB_VCON_LSB 6 - -#define I2C_BBPLL_OC_TSCHGP 4 -#define I2C_BBPLL_OC_TSCHGP_MSB 7 -#define I2C_BBPLL_OC_TSCHGP_LSB 7 - -#define I2C_BBPLL_OC_DR1 5 -#define I2C_BBPLL_OC_DR1_MSB 2 -#define I2C_BBPLL_OC_DR1_LSB 0 - -#define I2C_BBPLL_OC_DR3 5 -#define I2C_BBPLL_OC_DR3_MSB 6 -#define I2C_BBPLL_OC_DR3_LSB 4 - -#define I2C_BBPLL_EN_USB 5 -#define I2C_BBPLL_EN_USB_MSB 7 -#define I2C_BBPLL_EN_USB_LSB 7 - -#define I2C_BBPLL_OC_DCUR 6 -#define I2C_BBPLL_OC_DCUR_MSB 2 -#define I2C_BBPLL_OC_DCUR_LSB 0 - -#define I2C_BBPLL_INC_CUR 6 -#define I2C_BBPLL_INC_CUR_MSB 3 -#define I2C_BBPLL_INC_CUR_LSB 3 - -#define I2C_BBPLL_OC_DHREF_SEL 6 -#define I2C_BBPLL_OC_DHREF_SEL_MSB 5 -#define I2C_BBPLL_OC_DHREF_SEL_LSB 4 - -#define I2C_BBPLL_OC_DLREF_SEL 6 -#define I2C_BBPLL_OC_DLREF_SEL_MSB 7 -#define I2C_BBPLL_OC_DLREF_SEL_LSB 6 - -#define I2C_BBPLL_OR_CAL_CAP 8 -#define I2C_BBPLL_OR_CAL_CAP_MSB 3 -#define I2C_BBPLL_OR_CAL_CAP_LSB 0 - -#define I2C_BBPLL_OR_CAL_UDF 8 -#define I2C_BBPLL_OR_CAL_UDF_MSB 4 -#define I2C_BBPLL_OR_CAL_UDF_LSB 4 - -#define I2C_BBPLL_OR_CAL_OVF 8 -#define I2C_BBPLL_OR_CAL_OVF_MSB 5 -#define I2C_BBPLL_OR_CAL_OVF_LSB 5 - -#define I2C_BBPLL_OR_CAL_END 8 -#define I2C_BBPLL_OR_CAL_END_MSB 6 -#define I2C_BBPLL_OR_CAL_END_LSB 6 - -#define I2C_BBPLL_OR_LOCK 8 -#define I2C_BBPLL_OR_LOCK_MSB 7 -#define I2C_BBPLL_OR_LOCK_LSB 7 - -#define I2C_BBPLL_BBADC_DELAY1 9 -#define I2C_BBPLL_BBADC_DELAY1_MSB 1 -#define I2C_BBPLL_BBADC_DELAY1_LSB 0 - -#define I2C_BBPLL_BBADC_DELAY2 9 -#define I2C_BBPLL_BBADC_DELAY2_MSB 3 -#define I2C_BBPLL_BBADC_DELAY2_LSB 2 - -#define I2C_BBPLL_BBADC_DVDD 9 -#define I2C_BBPLL_BBADC_DVDD_MSB 5 -#define I2C_BBPLL_BBADC_DVDD_LSB 4 - -#define I2C_BBPLL_BBADC_DREF 9 -#define I2C_BBPLL_BBADC_DREF_MSB 7 -#define I2C_BBPLL_BBADC_DREF_LSB 6 - -#define I2C_BBPLL_BBADC_DCUR 10 -#define I2C_BBPLL_BBADC_DCUR_MSB 1 -#define I2C_BBPLL_BBADC_DCUR_LSB 0 - -#define I2C_BBPLL_BBADC_INPUT_SHORT 10 -#define I2C_BBPLL_BBADC_INPUT_SHORT_MSB 2 -#define I2C_BBPLL_BBADC_INPUT_SHORT_LSB 2 - -#define I2C_BBPLL_ENT_PLL 10 -#define I2C_BBPLL_ENT_PLL_MSB 3 -#define I2C_BBPLL_ENT_PLL_LSB 3 - -#define I2C_BBPLL_DTEST 10 -#define I2C_BBPLL_DTEST_MSB 5 -#define I2C_BBPLL_DTEST_LSB 4 - -#define I2C_BBPLL_ENT_ADC 10 -#define I2C_BBPLL_ENT_ADC_MSB 7 -#define I2C_BBPLL_ENT_ADC_LSB 6 diff --git a/components/esp_hw_support/port/esp32c2/private_include/regi2c_bbpll.h b/components/soc/esp32c2/include/soc/regi2c_bbpll.h similarity index 100% rename from components/esp_hw_support/port/esp32c2/private_include/regi2c_bbpll.h rename to components/soc/esp32c2/include/soc/regi2c_bbpll.h diff --git a/components/esp_hw_support/port/esp32c2/private_include/regi2c_bias.h b/components/soc/esp32c2/include/soc/regi2c_bias.h similarity index 100% rename from components/esp_hw_support/port/esp32c2/private_include/regi2c_bias.h rename to components/soc/esp32c2/include/soc/regi2c_bias.h diff --git a/components/esp_hw_support/port/esp32c2/private_include/regi2c_dig_reg.h b/components/soc/esp32c2/include/soc/regi2c_dig_reg.h similarity index 100% rename from components/esp_hw_support/port/esp32c2/private_include/regi2c_dig_reg.h rename to components/soc/esp32c2/include/soc/regi2c_dig_reg.h diff --git a/components/esp_hw_support/port/esp32c2/private_include/regi2c_lp_bias.h b/components/soc/esp32c2/include/soc/regi2c_lp_bias.h similarity index 100% rename from components/esp_hw_support/port/esp32c2/private_include/regi2c_lp_bias.h rename to components/soc/esp32c2/include/soc/regi2c_lp_bias.h diff --git a/components/soc/esp32c3/i2c_bbpll.h b/components/soc/esp32c3/i2c_bbpll.h deleted file mode 100644 index c9d4753f49..0000000000 --- a/components/soc/esp32c3/i2c_bbpll.h +++ /dev/null @@ -1,183 +0,0 @@ -// Copyright 2020 Espressif Systems (Shanghai) PTE LTD -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#pragma once - -/** - * @file i2c_apll.h - * @brief Register definitions for digital PLL (BBPLL) - * - * This file lists register fields of BBPLL, located on an internal configuration - * bus. These definitions are used via macros defined in i2c_rtc_clk.h, by - * rtc_clk_cpu_freq_set function in rtc_clk.c. - */ - -#define I2C_BBPLL 0x66 -#define I2C_BBPLL_HOSTID 1 - -#define I2C_BBPLL_IR_CAL_DELAY 0 -#define I2C_BBPLL_IR_CAL_DELAY_MSB 3 -#define I2C_BBPLL_IR_CAL_DELAY_LSB 0 - -#define I2C_BBPLL_IR_CAL_CK_DIV 0 -#define I2C_BBPLL_IR_CAL_CK_DIV_MSB 7 -#define I2C_BBPLL_IR_CAL_CK_DIV_LSB 4 - -#define I2C_BBPLL_IR_CAL_EXT_CAP 1 -#define I2C_BBPLL_IR_CAL_EXT_CAP_MSB 3 -#define I2C_BBPLL_IR_CAL_EXT_CAP_LSB 0 - -#define I2C_BBPLL_IR_CAL_ENX_CAP 1 -#define I2C_BBPLL_IR_CAL_ENX_CAP_MSB 4 -#define I2C_BBPLL_IR_CAL_ENX_CAP_LSB 4 - -#define I2C_BBPLL_IR_CAL_RSTB 1 -#define I2C_BBPLL_IR_CAL_RSTB_MSB 5 -#define I2C_BBPLL_IR_CAL_RSTB_LSB 5 - -#define I2C_BBPLL_IR_CAL_START 1 -#define I2C_BBPLL_IR_CAL_START_MSB 6 -#define I2C_BBPLL_IR_CAL_START_LSB 6 - -#define I2C_BBPLL_IR_CAL_UNSTOP 1 -#define I2C_BBPLL_IR_CAL_UNSTOP_MSB 7 -#define I2C_BBPLL_IR_CAL_UNSTOP_LSB 7 - -#define I2C_BBPLL_OC_REF_DIV 2 -#define I2C_BBPLL_OC_REF_DIV_MSB 3 -#define I2C_BBPLL_OC_REF_DIV_LSB 0 - -#define I2C_BBPLL_OC_DCHGP 2 -#define I2C_BBPLL_OC_DCHGP_MSB 6 -#define I2C_BBPLL_OC_DCHGP_LSB 4 - -#define I2C_BBPLL_OC_ENB_FCAL 2 -#define I2C_BBPLL_OC_ENB_FCAL_MSB 7 -#define I2C_BBPLL_OC_ENB_FCAL_LSB 7 - -#define I2C_BBPLL_OC_DIV_7_0 3 -#define I2C_BBPLL_OC_DIV_7_0_MSB 7 -#define I2C_BBPLL_OC_DIV_7_0_LSB 0 - -#define I2C_BBPLL_RSTB_DIV_ADC 4 -#define I2C_BBPLL_RSTB_DIV_ADC_MSB 0 -#define I2C_BBPLL_RSTB_DIV_ADC_LSB 0 - -#define I2C_BBPLL_MODE_HF 4 -#define I2C_BBPLL_MODE_HF_MSB 1 -#define I2C_BBPLL_MODE_HF_LSB 1 - -#define I2C_BBPLL_DIV_ADC 4 -#define I2C_BBPLL_DIV_ADC_MSB 3 -#define I2C_BBPLL_DIV_ADC_LSB 2 - -#define I2C_BBPLL_DIV_DAC 4 -#define I2C_BBPLL_DIV_DAC_MSB 4 -#define I2C_BBPLL_DIV_DAC_LSB 4 - -#define I2C_BBPLL_DIV_CPU 4 -#define I2C_BBPLL_DIV_CPU_MSB 5 -#define I2C_BBPLL_DIV_CPU_LSB 5 - -#define I2C_BBPLL_OC_ENB_VCON 4 -#define I2C_BBPLL_OC_ENB_VCON_MSB 6 -#define I2C_BBPLL_OC_ENB_VCON_LSB 6 - -#define I2C_BBPLL_OC_TSCHGP 4 -#define I2C_BBPLL_OC_TSCHGP_MSB 7 -#define I2C_BBPLL_OC_TSCHGP_LSB 7 - -#define I2C_BBPLL_OC_DR1 5 -#define I2C_BBPLL_OC_DR1_MSB 2 -#define I2C_BBPLL_OC_DR1_LSB 0 - -#define I2C_BBPLL_OC_DR3 5 -#define I2C_BBPLL_OC_DR3_MSB 6 -#define I2C_BBPLL_OC_DR3_LSB 4 - -#define I2C_BBPLL_EN_USB 5 -#define I2C_BBPLL_EN_USB_MSB 7 -#define I2C_BBPLL_EN_USB_LSB 7 - -#define I2C_BBPLL_OC_DCUR 6 -#define I2C_BBPLL_OC_DCUR_MSB 2 -#define I2C_BBPLL_OC_DCUR_LSB 0 - -#define I2C_BBPLL_INC_CUR 6 -#define I2C_BBPLL_INC_CUR_MSB 3 -#define I2C_BBPLL_INC_CUR_LSB 3 - -#define I2C_BBPLL_OC_DHREF_SEL 6 -#define I2C_BBPLL_OC_DHREF_SEL_MSB 5 -#define I2C_BBPLL_OC_DHREF_SEL_LSB 4 - -#define I2C_BBPLL_OC_DLREF_SEL 6 -#define I2C_BBPLL_OC_DLREF_SEL_MSB 7 -#define I2C_BBPLL_OC_DLREF_SEL_LSB 6 - -#define I2C_BBPLL_OR_CAL_CAP 8 -#define I2C_BBPLL_OR_CAL_CAP_MSB 3 -#define I2C_BBPLL_OR_CAL_CAP_LSB 0 - -#define I2C_BBPLL_OR_CAL_UDF 8 -#define I2C_BBPLL_OR_CAL_UDF_MSB 4 -#define I2C_BBPLL_OR_CAL_UDF_LSB 4 - -#define I2C_BBPLL_OR_CAL_OVF 8 -#define I2C_BBPLL_OR_CAL_OVF_MSB 5 -#define I2C_BBPLL_OR_CAL_OVF_LSB 5 - -#define I2C_BBPLL_OR_CAL_END 8 -#define I2C_BBPLL_OR_CAL_END_MSB 6 -#define I2C_BBPLL_OR_CAL_END_LSB 6 - -#define I2C_BBPLL_OR_LOCK 8 -#define I2C_BBPLL_OR_LOCK_MSB 7 -#define I2C_BBPLL_OR_LOCK_LSB 7 - -#define I2C_BBPLL_BBADC_DELAY1 9 -#define I2C_BBPLL_BBADC_DELAY1_MSB 1 -#define I2C_BBPLL_BBADC_DELAY1_LSB 0 - -#define I2C_BBPLL_BBADC_DELAY2 9 -#define I2C_BBPLL_BBADC_DELAY2_MSB 3 -#define I2C_BBPLL_BBADC_DELAY2_LSB 2 - -#define I2C_BBPLL_BBADC_DVDD 9 -#define I2C_BBPLL_BBADC_DVDD_MSB 5 -#define I2C_BBPLL_BBADC_DVDD_LSB 4 - -#define I2C_BBPLL_BBADC_DREF 9 -#define I2C_BBPLL_BBADC_DREF_MSB 7 -#define I2C_BBPLL_BBADC_DREF_LSB 6 - -#define I2C_BBPLL_BBADC_DCUR 10 -#define I2C_BBPLL_BBADC_DCUR_MSB 1 -#define I2C_BBPLL_BBADC_DCUR_LSB 0 - -#define I2C_BBPLL_BBADC_INPUT_SHORT 10 -#define I2C_BBPLL_BBADC_INPUT_SHORT_MSB 2 -#define I2C_BBPLL_BBADC_INPUT_SHORT_LSB 2 - -#define I2C_BBPLL_ENT_PLL 10 -#define I2C_BBPLL_ENT_PLL_MSB 3 -#define I2C_BBPLL_ENT_PLL_LSB 3 - -#define I2C_BBPLL_DTEST 10 -#define I2C_BBPLL_DTEST_MSB 5 -#define I2C_BBPLL_DTEST_LSB 4 - -#define I2C_BBPLL_ENT_ADC 10 -#define I2C_BBPLL_ENT_ADC_MSB 7 -#define I2C_BBPLL_ENT_ADC_LSB 6 diff --git a/components/esp_hw_support/port/esp32c3/private_include/regi2c_bbpll.h b/components/soc/esp32c3/include/soc/regi2c_bbpll.h similarity index 100% rename from components/esp_hw_support/port/esp32c3/private_include/regi2c_bbpll.h rename to components/soc/esp32c3/include/soc/regi2c_bbpll.h diff --git a/components/esp_hw_support/port/esp32c3/private_include/regi2c_bias.h b/components/soc/esp32c3/include/soc/regi2c_bias.h similarity index 100% rename from components/esp_hw_support/port/esp32c3/private_include/regi2c_bias.h rename to components/soc/esp32c3/include/soc/regi2c_bias.h diff --git a/components/esp_hw_support/port/esp32c3/private_include/regi2c_dig_reg.h b/components/soc/esp32c3/include/soc/regi2c_dig_reg.h similarity index 100% rename from components/esp_hw_support/port/esp32c3/private_include/regi2c_dig_reg.h rename to components/soc/esp32c3/include/soc/regi2c_dig_reg.h diff --git a/components/esp_hw_support/port/esp32c3/private_include/regi2c_lp_bias.h b/components/soc/esp32c3/include/soc/regi2c_lp_bias.h similarity index 100% rename from components/esp_hw_support/port/esp32c3/private_include/regi2c_lp_bias.h rename to components/soc/esp32c3/include/soc/regi2c_lp_bias.h diff --git a/components/soc/esp32h2/i2c_bbpll.h b/components/soc/esp32h2/i2c_bbpll.h deleted file mode 100644 index 2efd12168b..0000000000 --- a/components/soc/esp32h2/i2c_bbpll.h +++ /dev/null @@ -1,120 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#pragma once - -/** - * @file i2c_apll.h - * @brief Register definitions for digital PLL (BBPLL) - * - * This file lists register fields of BBPLL, located on an internal configuration - * bus. These definitions are used via macros defined in i2c_rtc_clk.h, by - * rtc_clk_cpu_freq_set function in rtc_clk.c. - */ - -#define I2C_BBPLL 0x66 -#define I2C_BBPLL_HOSTID 0 - - -#define I2C_BBPLL_IR_CAL_DELAY 0 -#define I2C_BBPLL_IR_CAL_DELAY_MSB 3 -#define I2C_BBPLL_IR_CAL_DELAY_LSB 0 - -#define I2C_BBPLL_IR_CAL_CK_DIV 0 -#define I2C_BBPLL_IR_CAL_CK_DIV_MSB 7 -#define I2C_BBPLL_IR_CAL_CK_DIV_LSB 4 - -#define I2C_BBPLL_IR_CAL_EXT_CAP 1 -#define I2C_BBPLL_IR_CAL_EXT_CAP_MSB 3 -#define I2C_BBPLL_IR_CAL_EXT_CAP_LSB 0 - -#define I2C_BBPLL_IR_CAL_ENX_CAP 1 -#define I2C_BBPLL_IR_CAL_ENX_CAP_MSB 4 -#define I2C_BBPLL_IR_CAL_ENX_CAP_LSB 4 - -#define I2C_BBPLL_IR_CAL_RSTB 1 -#define I2C_BBPLL_IR_CAL_RSTB_MSB 5 -#define I2C_BBPLL_IR_CAL_RSTB_LSB 5 - -#define I2C_BBPLL_IR_CAL_START 1 -#define I2C_BBPLL_IR_CAL_START_MSB 6 -#define I2C_BBPLL_IR_CAL_START_LSB 6 - -#define I2C_BBPLL_IR_CAL_UNSTOP 1 -#define I2C_BBPLL_IR_CAL_UNSTOP_MSB 7 -#define I2C_BBPLL_IR_CAL_UNSTOP_LSB 7 - -#define I2C_BBPLL_OC_REF_DIV 2 -#define I2C_BBPLL_OC_REF_DIV_MSB 3 -#define I2C_BBPLL_OC_REF_DIV_LSB 0 - -#define I2C_BBPLL_OC_DIV 3 -#define I2C_BBPLL_OC_DIV_MSB 5 -#define I2C_BBPLL_OC_DIV_LSB 0 - -#define I2C_BBPLL_OC_CHGP_DCUR 4 -#define I2C_BBPLL_OC_CHGP_DCUR_MSB 2 -#define I2C_BBPLL_OC_CHGP_DCUR_LSB 0 - -#define I2C_BBPLL_OC_BUFF_DCUR 4 -#define I2C_BBPLL_OC_BUFF_DCUR_MSB 5 -#define I2C_BBPLL_OC_BUFF_DCUR_LSB 3 - -#define I2C_BBPLL_OC_TSCHGP 4 -#define I2C_BBPLL_OC_TSCHGP_MSB 6 -#define I2C_BBPLL_OC_TSCHGP_LSB 6 - -#define I2C_BBPLL_OC_ENB_FCAL 4 -#define I2C_BBPLL_OC_ENB_FCAL_MSB 7 -#define I2C_BBPLL_OC_ENB_FCAL_LSB 7 - -#define I2C_BBPLL_OC_LPF_DR 5 -#define I2C_BBPLL_OC_LPF_DR_MSB 1 -#define I2C_BBPLL_OC_LPF_DR_LSB 0 - -#define I2C_BBPLL_OC_VCO_DCUR 5 -#define I2C_BBPLL_OC_VCO_DCUR_MSB 3 -#define I2C_BBPLL_OC_VCO_DCUR_LSB 2 - -#define I2C_BBPLL_OC_DHREF_SEL 5 -#define I2C_BBPLL_OC_DHREF_SEL_MSB 5 -#define I2C_BBPLL_OC_DHREF_SEL_LSB 4 - -#define I2C_BBPLL_OC_DLREF_SEL 5 -#define I2C_BBPLL_OC_DLREF_SEL_MSB 7 -#define I2C_BBPLL_OC_DLREF_SEL_LSB 6 - -#define I2C_BBPLL_OR_CAL_CAP 8 -#define I2C_BBPLL_OR_CAL_CAP_MSB 3 -#define I2C_BBPLL_OR_CAL_CAP_LSB 0 - -#define I2C_BBPLL_OR_CAL_UDF 8 -#define I2C_BBPLL_OR_CAL_UDF_MSB 4 -#define I2C_BBPLL_OR_CAL_UDF_LSB 4 - -#define I2C_BBPLL_OR_CAL_OVF 8 -#define I2C_BBPLL_OR_CAL_OVF_MSB 5 -#define I2C_BBPLL_OR_CAL_OVF_LSB 5 - -#define I2C_BBPLL_OR_CAL_END 8 -#define I2C_BBPLL_OR_CAL_END_MSB 6 -#define I2C_BBPLL_OR_CAL_END_LSB 6 - -#define I2C_BBPLL_OR_LOCK 8 -#define I2C_BBPLL_OR_LOCK_MSB 7 -#define I2C_BBPLL_OR_LOCK_LSB 7 - -#define I2C_BBPLL_DTEST 10 -#define I2C_BBPLL_DTEST_MSB 1 -#define I2C_BBPLL_DTEST_LSB 0 - -#define I2C_BBPLL_ENT_PLL 10 -#define I2C_BBPLL_ENT_PLL_MSB 2 -#define I2C_BBPLL_ENT_PLL_LSB 2 - -#define I2C_BBPLL_DIV_CPU 10 -#define I2C_BBPLL_DIV_CPU_MSB 3 -#define I2C_BBPLL_DIV_CPU_LSB 3 diff --git a/components/esp_hw_support/port/esp32h2/private_include/regi2c_bbpll.h b/components/soc/esp32h2/include/soc/regi2c_bbpll.h similarity index 100% rename from components/esp_hw_support/port/esp32h2/private_include/regi2c_bbpll.h rename to components/soc/esp32h2/include/soc/regi2c_bbpll.h diff --git a/components/esp_hw_support/port/esp32h2/private_include/regi2c_bias.h b/components/soc/esp32h2/include/soc/regi2c_bias.h similarity index 100% rename from components/esp_hw_support/port/esp32h2/private_include/regi2c_bias.h rename to components/soc/esp32h2/include/soc/regi2c_bias.h diff --git a/components/esp_hw_support/port/esp32h2/private_include/regi2c_dig_reg.h b/components/soc/esp32h2/include/soc/regi2c_dig_reg.h similarity index 100% rename from components/esp_hw_support/port/esp32h2/private_include/regi2c_dig_reg.h rename to components/soc/esp32h2/include/soc/regi2c_dig_reg.h diff --git a/components/esp_hw_support/port/esp32h2/private_include/regi2c_lp_bias.h b/components/soc/esp32h2/include/soc/regi2c_lp_bias.h similarity index 100% rename from components/esp_hw_support/port/esp32h2/private_include/regi2c_lp_bias.h rename to components/soc/esp32h2/include/soc/regi2c_lp_bias.h diff --git a/components/esp_hw_support/port/esp32h2/private_include/regi2c_pmu.h b/components/soc/esp32h2/include/soc/regi2c_pmu.h similarity index 100% rename from components/esp_hw_support/port/esp32h2/private_include/regi2c_pmu.h rename to components/soc/esp32h2/include/soc/regi2c_pmu.h diff --git a/components/esp_hw_support/port/esp32h2/private_include/regi2c_ulp.h b/components/soc/esp32h2/include/soc/regi2c_ulp.h similarity index 100% rename from components/esp_hw_support/port/esp32h2/private_include/regi2c_ulp.h rename to components/soc/esp32h2/include/soc/regi2c_ulp.h diff --git a/components/esp_hw_support/port/esp32s2/private_include/regi2c_apll.h b/components/soc/esp32s2/include/soc/regi2c_apll.h similarity index 100% rename from components/esp_hw_support/port/esp32s2/private_include/regi2c_apll.h rename to components/soc/esp32s2/include/soc/regi2c_apll.h diff --git a/components/esp_hw_support/port/esp32s2/private_include/regi2c_bbpll.h b/components/soc/esp32s2/include/soc/regi2c_bbpll.h similarity index 100% rename from components/esp_hw_support/port/esp32s2/private_include/regi2c_bbpll.h rename to components/soc/esp32s2/include/soc/regi2c_bbpll.h diff --git a/components/esp_hw_support/port/esp32s2/private_include/regi2c_ulp.h b/components/soc/esp32s2/include/soc/regi2c_ulp.h similarity index 100% rename from components/esp_hw_support/port/esp32s2/private_include/regi2c_ulp.h rename to components/soc/esp32s2/include/soc/regi2c_ulp.h diff --git a/components/esp_hw_support/port/esp32s3/private_include/regi2c_bbpll.h b/components/soc/esp32s3/include/soc/regi2c_bbpll.h similarity index 100% rename from components/esp_hw_support/port/esp32s3/private_include/regi2c_bbpll.h rename to components/soc/esp32s3/include/soc/regi2c_bbpll.h diff --git a/components/esp_hw_support/port/esp32s3/private_include/regi2c_dig_reg.h b/components/soc/esp32s3/include/soc/regi2c_dig_reg.h similarity index 100% rename from components/esp_hw_support/port/esp32s3/private_include/regi2c_dig_reg.h rename to components/soc/esp32s3/include/soc/regi2c_dig_reg.h diff --git a/components/esp_hw_support/port/esp32s3/private_include/regi2c_lp_bias.h b/components/soc/esp32s3/include/soc/regi2c_lp_bias.h similarity index 100% rename from components/esp_hw_support/port/esp32s3/private_include/regi2c_lp_bias.h rename to components/soc/esp32s3/include/soc/regi2c_lp_bias.h diff --git a/components/esp_hw_support/port/esp32s3/private_include/regi2c_ulp.h b/components/soc/esp32s3/include/soc/regi2c_ulp.h similarity index 100% rename from components/esp_hw_support/port/esp32s3/private_include/regi2c_ulp.h rename to components/soc/esp32s3/include/soc/regi2c_ulp.h