Merge branch 'bugfix/regi2c_ctrl_spinlock_s2' into 'master'

hw_support: fixed regi2c not protected by lock on ESP32S2

See merge request espressif/esp-idf!16653

components/hal/esp32s3/brownout_hal.c

@@ -1,22 +1,14 @@
 
-// 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.
+/*
+ * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 #include "hal/brownout_hal.h"
 #include "soc/rtc_cntl_struct.h"
 #include "soc/rtc_cntl_reg.h"
-#include "regi2c_ctrl.h"
+#include "esp_private/regi2c_ctrl.h"
 #include "regi2c_brownout.h"
 
 

components/hal/esp32s3/include/hal/adc_ll.h

@@ -7,7 +7,6 @@
 
 #include <stdio.h>
 #include <stdbool.h>
-#include "regi2c_ctrl.h"
 
 #include "soc/adc_periph.h"
 #include "hal/adc_types.h"
@@ -18,6 +17,9 @@
 #include "soc/rtc_cntl_reg.h"
 #include "hal/misc.h"
 
+#include "esp_private/regi2c_ctrl.h"
+#include "regi2c_saradc.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif

components/hal/esp32s3/include/hal/temperature_sensor_ll.h

@@ -15,7 +15,8 @@
 #pragma once
 
 #include <stdbool.h>
-#include "regi2c_ctrl.h"
+#include "esp_private/regi2c_ctrl.h"
+#include "regi2c_saradc.h"
 #include "soc/apb_saradc_struct.h"
 #include "soc/rtc_cntl_reg.h"
 #include "soc/sens_struct.h"