From 2ec93b33948a472c304455e42ca16d84cdd7fe82 Mon Sep 17 00:00:00 2001
From: boarchuz <46267286+boarchuz@users.noreply.github.com>
Date: Sat, 16 Oct 2021 16:05:48 +1100
Subject: [PATCH] fix(touch): fix unexpected touch start on RTC peripheral init

Merges https://github.com/espressif/esp-idf/pull/7707
---
 components/hal/esp32/include/hal/touch_sensor_ll.h   | 2 +-
 components/hal/esp32s2/include/hal/touch_sensor_ll.h | 2 +-
 components/hal/esp32s3/include/hal/touch_sensor_ll.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/hal/esp32/include/hal/touch_sensor_ll.h b/components/hal/esp32/include/hal/touch_sensor_ll.h
index 455626b004..53929a20bf 100644
--- a/components/hal/esp32/include/hal/touch_sensor_ll.h
+++ b/components/hal/esp32/include/hal/touch_sensor_ll.h
@@ -681,8 +681,8 @@ static inline void touch_ll_stop_fsm(void)
  */
 static inline void touch_ll_start_sw_meas(void)
 {
-    SENS.sar_touch_ctrl2.touch_start_en = 0;
     SENS.sar_touch_ctrl2.touch_start_en = 1;
+    SENS.sar_touch_ctrl2.touch_start_en = 0;
 }
 
 /**
diff --git a/components/hal/esp32s2/include/hal/touch_sensor_ll.h b/components/hal/esp32s2/include/hal/touch_sensor_ll.h
index a5e38e8982..2ce086cc6f 100644
--- a/components/hal/esp32s2/include/hal/touch_sensor_ll.h
+++ b/components/hal/esp32s2/include/hal/touch_sensor_ll.h
@@ -1061,8 +1061,8 @@ static inline bool touch_ll_get_fsm_state(void)
  */
 static inline void touch_ll_start_sw_meas(void)
 {
-    RTCCNTL.touch_ctrl2.touch_start_en = 0;
     RTCCNTL.touch_ctrl2.touch_start_en = 1;
+    RTCCNTL.touch_ctrl2.touch_start_en = 0;
 }
 
 /**
diff --git a/components/hal/esp32s3/include/hal/touch_sensor_ll.h b/components/hal/esp32s3/include/hal/touch_sensor_ll.h
index 193950ee70..d57129e5c0 100644
--- a/components/hal/esp32s3/include/hal/touch_sensor_ll.h
+++ b/components/hal/esp32s3/include/hal/touch_sensor_ll.h
@@ -1086,8 +1086,8 @@ static inline bool touch_ll_get_fsm_state(void)
  */
 static inline void touch_ll_start_sw_meas(void)
 {
-    RTCCNTL.touch_ctrl2.touch_start_en = 0;
     RTCCNTL.touch_ctrl2.touch_start_en = 1;
+    RTCCNTL.touch_ctrl2.touch_start_en = 0;
 }
 
 /**