Merge branch 'feature/support_p4_ulp_touch_driver' into 'master'

feat(ulp_touch): support ulp touch driver on p4

Closes IDF-12546

See merge request espressif/esp-idf!37362

Author: L-KAYA

components/esp_driver_touch_sens/common/touch_sens_common.c

@@ -32,7 +32,7 @@
 #include "esp_check.h"
 #include "touch_sens_private.h"
 
-#define TOUCH_CHANNEL_CHECK(num)        ESP_RETURN_ON_FALSE(num >= TOUCH_MIN_CHAN_ID && num <= TOUCH_MAX_CHAN_ID,  \
+#define TOUCH_CHANNEL_CHECK(num)        ESP_RETURN_ON_FALSE((int)(num) >= (int)TOUCH_MIN_CHAN_ID && num <= TOUCH_MAX_CHAN_ID,  \
                                         ESP_ERR_INVALID_ARG, TAG, "The channel number is out of supported range");
 
 static const char *TAG = "touch";

components/esp_driver_touch_sens/hw_ver1/include/driver/touch_version_types.h

@@ -19,9 +19,6 @@
 extern "C" {
 #endif
 
-#define TOUCH_MIN_CHAN_ID           0           /*!< The minimum available channel id of the touch pad */
-#define TOUCH_MAX_CHAN_ID           9           /*!< The maximum available channel id of the touch pad */
-
 /**
  * @brief Helper macro to the default configurations of the touch sensor controller
  *

components/esp_driver_touch_sens/hw_ver2/include/driver/touch_version_types.h

@@ -19,9 +19,6 @@
 extern "C" {
 #endif
 
-#define TOUCH_MIN_CHAN_ID           1           /*!< The minimum available channel id of the touch pad */
-#define TOUCH_MAX_CHAN_ID           14          /*!< The maximum available channel id of the touch pad */
-
 #define TOUCH_SHIELD_CHAN_ID        14          /*!< The touch channel that can be used as the shield channel */
 
 /**

components/esp_driver_touch_sens/hw_ver3/include/driver/touch_version_types.h

@@ -19,9 +19,6 @@
 extern "C" {
 #endif
 
-#define TOUCH_MIN_CHAN_ID           0           /*!< The minimum available channel id of the touch pad */
-#define TOUCH_MAX_CHAN_ID           13          /*!< The maximum available channel id of the touch pad */
-
 /**
  * @brief Helper macro to the default configurations of the touch sensor controller
  *

components/esp_driver_touch_sens/include/driver/touch_sens_types.h

@@ -22,6 +22,9 @@ extern "C" {
 #define TOUCH_PROXIMITY_CHAN_NUM    SOC_TOUCH_PROXIMITY_CHANNEL_NUM     /*!< The supported proximity channel number in proximity sensing mode */
 #endif
 
+#define TOUCH_MIN_CHAN_ID           SOC_TOUCH_MIN_CHAN_ID               /*!< The minimum available channel id of the touch pad */
+#define TOUCH_MAX_CHAN_ID           SOC_TOUCH_MAX_CHAN_ID               /*!< The maximum available channel id of the touch pad */
+
 /**
  * @brief The chip sleep level that allows the touch sensor to wake-up
  *

components/hal/esp32p4/include/hal/touch_sensor_ll.h

@@ -584,6 +584,18 @@ static inline void touch_ll_sample_cfg_set_engaged_num(uint8_t sample_cfg_num)
     LP_ANA_PERI.touch_scan_ctrl2.freq_scan_cnt_limit = sample_cfg_num ? sample_cfg_num : 1;
 }
 
+/**
+ * Get the engaged sample configuration number
+ *
+ * @return The engaged sample configuration number, range 0~3.
+ */
+static inline uint32_t touch_ll_sample_cfg_get_engaged_num(void)
+{
+    uint32_t sample_cfg_num = LP_ANA_PERI.touch_scan_ctrl2.freq_scan_cnt_limit;
+    return sample_cfg_num ? sample_cfg_num : 1;
+}
+
+
 /**
  * Set capacitance and resistance of the RC filter of the sampling frequency.
  *

components/hal/esp32s2/include/hal/touch_sensor_ll.h

@@ -1682,6 +1682,29 @@ static inline void touch_ll_sleep_read_data(uint32_t *raw_data)
     *raw_data = SENS.sar_touch_status[touch_num - 1].touch_pad_data;
 }
 
+/**
+ * Get the data of the touch channel according to the types
+ *
+ * @param sample_cfg_id The sample configuration index
+ * @param type  data type
+ *              0/1: TOUCH_LL_READ_RAW, the raw data of the touch channel
+ *              2:   TOUCH_LL_READ_BENCHMARK, benchmark value of touch channel,
+ *                   the benchmark value is the maximum during the first measurement period
+ *              3:   TOUCH_LL_READ_SMOOTH, the smoothed data that obtained by filtering the raw data.
+ * @param smooth_data pointer to smoothed data
+ */
+__attribute__((always_inline))
+static inline void touch_ll_sleep_read_chan_data(uint8_t type, uint32_t *data)
+{
+    SENS.sar_touch_conf.touch_data_sel = type;
+    if (type == TOUCH_LL_READ_RAW) {
+        uint32_t touch_num = RTCCNTL.touch_slp_thres.touch_slp_pad;
+        *data = SENS.sar_touch_status[touch_num - 1].touch_pad_data;
+    } else {
+        *data = SENS.sar_touch_slp_status.touch_slp_data;
+    }
+}
+
 /**
  * Select touch sensor dbias to save power in sleep mode.
  *

components/hal/esp32s3/include/hal/touch_sensor_ll.h

@@ -1718,6 +1718,29 @@ static inline void touch_ll_sleep_read_data(uint32_t *raw_data)
     *raw_data = SENS.sar_touch_status[touch_num - 1].touch_pad_data;
 }
 
+/**
+ * Get the data of the touch channel according to the types
+ *
+ * @param sample_cfg_id The sample configuration index
+ * @param type  data type
+ *              0/1: TOUCH_LL_READ_RAW, the raw data of the touch channel
+ *              2:   TOUCH_LL_READ_BENCHMARK, benchmark value of touch channel,
+ *                   the benchmark value is the maximum during the first measurement period
+ *              3:   TOUCH_LL_READ_SMOOTH, the smoothed data that obtained by filtering the raw data.
+ * @param smooth_data pointer to smoothed data
+ */
+__attribute__((always_inline))
+static inline void touch_ll_sleep_read_chan_data(uint8_t type, uint32_t *data)
+{
+    SENS.sar_touch_conf.touch_data_sel = type;
+    if (type == TOUCH_LL_READ_RAW) {
+        uint32_t touch_num = RTCCNTL.touch_slp_thres.touch_slp_pad;
+        *data = SENS.sar_touch_status[touch_num - 1].touch_pad_data;
+    } else {
+        *data = SENS.sar_touch_slp_status.touch_slp_data;
+    }
+}
+
 
 /**
  * Select touch sensor dbias to save power in sleep mode.

components/soc/esp32/include/soc/Kconfig.soc_caps.in

@@ -735,6 +735,14 @@ config SOC_TOUCH_SENSOR_NUM
     int
     default 10
 
+config SOC_TOUCH_MIN_CHAN_ID
+    int
+    default 0
+
+config SOC_TOUCH_MAX_CHAN_ID
+    int
+    default 9
+
 config SOC_TOUCH_SUPPORT_SLEEP_WAKEUP
     bool
     default y

components/soc/esp32/include/soc/soc_caps.h

@@ -336,6 +336,8 @@
 /*-------------------------- TOUCH SENSOR CAPS -------------------------------*/
 #define SOC_TOUCH_SENSOR_VERSION            (1U)     /*!<Hardware version of touch sensor */
 #define SOC_TOUCH_SENSOR_NUM                (10)
+#define SOC_TOUCH_MIN_CHAN_ID               (0U)    /*!< Touch minimum channel number */
+#define SOC_TOUCH_MAX_CHAN_ID               (9)     /*!< Touch maximum channel number */
 #define SOC_TOUCH_SUPPORT_SLEEP_WAKEUP      (1)
 #define SOC_TOUCH_SAMPLE_CFG_NUM            (1U)    /*!< The sample configuration number in total, each sampler can be used to sample on one frequency */