From b170aba93a6db18a39b3cef9a45e9e1d91a3cd05 Mon Sep 17 00:00:00 2001 From: morris Date: Thu, 16 Dec 2021 23:13:09 +0800 Subject: [PATCH] timer: fix wrong kconfig soc caps --- components/soc/esp32/include/soc/Kconfig.soc_caps.in | 4 ++++ components/soc/esp32/include/soc/soc_caps.h | 2 +- .../soc/esp32c3/include/soc/Kconfig.soc_caps.in | 8 ++++++-- components/soc/esp32c3/include/soc/soc_caps.h | 4 ++-- .../soc/esp32h2/include/soc/Kconfig.soc_caps.in | 8 ++++++-- components/soc/esp32h2/include/soc/soc_caps.h | 4 ++-- .../soc/esp32s2/include/soc/Kconfig.soc_caps.in | 12 ++++++++---- components/soc/esp32s2/include/soc/soc_caps.h | 4 ++-- .../soc/esp32s3/include/soc/Kconfig.soc_caps.in | 4 ++++ components/soc/esp32s3/include/soc/soc_caps.h | 2 +- .../soc/esp8684/include/soc/Kconfig.soc_caps.in | 4 ++++ components/soc/esp8684/include/soc/soc_caps.h | 2 +- 12 files changed, 41 insertions(+), 17 deletions(-) diff --git a/components/soc/esp32/include/soc/Kconfig.soc_caps.in b/components/soc/esp32/include/soc/Kconfig.soc_caps.in index badcf053cf..d3764aadde 100644 --- a/components/soc/esp32/include/soc/Kconfig.soc_caps.in +++ b/components/soc/esp32/include/soc/Kconfig.soc_caps.in @@ -431,6 +431,10 @@ config SOC_TIMER_GROUP_COUNTER_BIT_WIDTH int default 64 +config SOC_TIMER_GROUP_TOTAL_TIMERS + int + default 4 + config SOC_TOUCH_VERSION_1 bool default y diff --git a/components/soc/esp32/include/soc/soc_caps.h b/components/soc/esp32/include/soc/soc_caps.h index 84bba07f0c..2c672d56dc 100644 --- a/components/soc/esp32/include/soc/soc_caps.h +++ b/components/soc/esp32/include/soc/soc_caps.h @@ -249,7 +249,7 @@ #define SOC_TIMER_GROUPS (2) #define SOC_TIMER_GROUP_TIMERS_PER_GROUP (2) #define SOC_TIMER_GROUP_COUNTER_BIT_WIDTH (64) -#define SOC_TIMER_GROUP_TOTAL_TIMERS (SOC_TIMER_GROUPS * SOC_TIMER_GROUP_TIMERS_PER_GROUP) +#define SOC_TIMER_GROUP_TOTAL_TIMERS (4) /*-------------------------- TOUCH SENSOR CAPS -------------------------------*/ #define SOC_TOUCH_VERSION_1 (1) /*!