feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

timer: fix wrong kconfig soc caps

Browse Source
This commit is contained in:
morris
2021-12-16 23:13:09 +08:00
parent f6cedb0533
commit b170aba93a
12 changed files with 41 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/soc/esp32/include/soc/Kconfig.soc_caps.in
View File

@@ -431,6 +431,10 @@ config SOC_TIMER_GROUP_COUNTER_BIT_WIDTH
int int
default 64 default 64
config SOC_TIMER_GROUP_TOTAL_TIMERS
int
default 4
config SOC_TOUCH_VERSION_1 config SOC_TOUCH_VERSION_1
bool bool
default y default y

2
components/soc/esp32/include/soc/soc_caps.h
View File

@@ -249,7 +249,7 @@
#define SOC_TIMER_GROUPS (2) #define SOC_TIMER_GROUPS (2)
#define SOC_TIMER_GROUP_TIMERS_PER_GROUP (2) #define SOC_TIMER_GROUP_TIMERS_PER_GROUP (2)
#define SOC_TIMER_GROUP_COUNTER_BIT_WIDTH (64) #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 -------------------------------*/ /*-------------------------- TOUCH SENSOR CAPS -------------------------------*/
#define SOC_TOUCH_VERSION_1 (1) /*!<Hardware version of touch sensor */ #define SOC_TOUCH_VERSION_1 (1) /*!<Hardware version of touch sensor */

8
components/soc/esp32c3/include/soc/Kconfig.soc_caps.in
View File

@@ -528,8 +528,8 @@ config SOC_TIMER_GROUPS
default 2 default 2
config SOC_TIMER_GROUP_TIMERS_PER_GROUP config SOC_TIMER_GROUP_TIMERS_PER_GROUP
bool int
default y default 1
config SOC_TIMER_GROUP_COUNTER_BIT_WIDTH config SOC_TIMER_GROUP_COUNTER_BIT_WIDTH
int int
@@ -539,6 +539,10 @@ config SOC_TIMER_GROUP_SUPPORT_XTAL
bool bool
default y default y
config SOC_TIMER_GROUP_TOTAL_TIMERS
int
default 2
config SOC_TOUCH_SENSOR_NUM config SOC_TOUCH_SENSOR_NUM
bool bool
default n default n

4
components/soc/esp32c3/include/soc/soc_caps.h
View File

@@ -264,10 +264,10 @@
/*--------------------------- TIMER GROUP CAPS ---------------------------------------*/ /*--------------------------- TIMER GROUP CAPS ---------------------------------------*/
#define SOC_TIMER_GROUPS (2) #define SOC_TIMER_GROUPS (2)
#define SOC_TIMER_GROUP_TIMERS_PER_GROUP (1) #define SOC_TIMER_GROUP_TIMERS_PER_GROUP (1U)
#define SOC_TIMER_GROUP_COUNTER_BIT_WIDTH (54) #define SOC_TIMER_GROUP_COUNTER_BIT_WIDTH (54)
#define SOC_TIMER_GROUP_SUPPORT_XTAL (1) #define SOC_TIMER_GROUP_SUPPORT_XTAL (1)
#define SOC_TIMER_GROUP_TOTAL_TIMERS (SOC_TIMER_GROUPS * SOC_TIMER_GROUP_TIMERS_PER_GROUP) #define SOC_TIMER_GROUP_TOTAL_TIMERS (2)
/*-------------------------- TOUCH SENSOR CAPS -------------------------------*/ /*-------------------------- TOUCH SENSOR CAPS -------------------------------*/
#define SOC_TOUCH_SENSOR_NUM (0) /*! No touch sensors on ESP32-C3 */ #define SOC_TOUCH_SENSOR_NUM (0) /*! No touch sensors on ESP32-C3 */

8
components/soc/esp32h2/include/soc/Kconfig.soc_caps.in
View File

@@ -508,8 +508,8 @@ config SOC_TIMER_GROUPS
default 2 default 2
config SOC_TIMER_GROUP_TIMERS_PER_GROUP config SOC_TIMER_GROUP_TIMERS_PER_GROUP
bool int
default y default 1
config SOC_TIMER_GROUP_COUNTER_BIT_WIDTH config SOC_TIMER_GROUP_COUNTER_BIT_WIDTH
int int
@@ -519,6 +519,10 @@ config SOC_TIMER_GROUP_SUPPORT_XTAL
bool bool
default y default y
config SOC_TIMER_GROUP_TOTAL_TIMERS
int
default 2
config SOC_TOUCH_SENSOR_NUM config SOC_TOUCH_SENSOR_NUM
bool bool
default n default n

4
components/soc/esp32h2/include/soc/soc_caps.h
View File

@@ -258,10 +258,10 @@
/*--------------------------- TIMER GROUP CAPS ---------------------------------------*/ /*--------------------------- TIMER GROUP CAPS ---------------------------------------*/
#define SOC_TIMER_GROUPS (2) #define SOC_TIMER_GROUPS (2)
#define SOC_TIMER_GROUP_TIMERS_PER_GROUP (1) #define SOC_TIMER_GROUP_TIMERS_PER_GROUP (1U)
#define SOC_TIMER_GROUP_COUNTER_BIT_WIDTH (54) #define SOC_TIMER_GROUP_COUNTER_BIT_WIDTH (54)
#define SOC_TIMER_GROUP_SUPPORT_XTAL (1) #define SOC_TIMER_GROUP_SUPPORT_XTAL (1)
#define SOC_TIMER_GROUP_TOTAL_TIMERS (SOC_TIMER_GROUPS * SOC_TIMER_GROUP_TIMERS_PER_GROUP) #define SOC_TIMER_GROUP_TOTAL_TIMERS (2)
/*-------------------------- TOUCH SENSOR CAPS -------------------------------*/ /*-------------------------- TOUCH SENSOR CAPS -------------------------------*/
#define SOC_TOUCH_SENSOR_NUM (0) /*! No touch sensors on ESP32-C3 */ #define SOC_TOUCH_SENSOR_NUM (0) /*! No touch sensors on ESP32-C3 */

12
components/soc/esp32s2/include/soc/Kconfig.soc_caps.in
View File

@@ -507,10 +507,6 @@ config SOC_SYSTIMER_BIT_WIDTH_HI
int int
default 32 default 32
config SOC_TIMER_GROUP_COUNTER_BIT_WIDTH
int
default 64
config SOC_TIMER_GROUPS config SOC_TIMER_GROUPS
int int
default 2 default 2
@@ -519,10 +515,18 @@ config SOC_TIMER_GROUP_TIMERS_PER_GROUP
int int
default 2 default 2
config SOC_TIMER_GROUP_COUNTER_BIT_WIDTH
int
default 64
config SOC_TIMER_GROUP_SUPPORT_XTAL config SOC_TIMER_GROUP_SUPPORT_XTAL
bool bool
default y default y
config SOC_TIMER_GROUP_TOTAL_TIMERS
int
default 4
config SOC_TOUCH_VERSION_2 config SOC_TOUCH_VERSION_2
bool bool
default y default y

4
components/soc/esp32s2/include/soc/soc_caps.h
View File

@@ -248,11 +248,11 @@
#define SOC_SYSTIMER_BIT_WIDTH_HI (32) // Bit width of systimer high part #define SOC_SYSTIMER_BIT_WIDTH_HI (32) // Bit width of systimer high part
/*-------------------------- TIMER GROUP CAPS --------------------------------*/ /*-------------------------- TIMER GROUP CAPS --------------------------------*/
#define SOC_TIMER_GROUP_COUNTER_BIT_WIDTH (64)
#define SOC_TIMER_GROUPS (2) #define SOC_TIMER_GROUPS (2)
#define SOC_TIMER_GROUP_TIMERS_PER_GROUP (2) #define SOC_TIMER_GROUP_TIMERS_PER_GROUP (2)
#define SOC_TIMER_GROUP_COUNTER_BIT_WIDTH (64)
#define SOC_TIMER_GROUP_SUPPORT_XTAL (1) #define SOC_TIMER_GROUP_SUPPORT_XTAL (1)
#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 -------------------------------*/ /*-------------------------- TOUCH SENSOR CAPS -------------------------------*/
#define SOC_TOUCH_VERSION_2 (1) /*!<Hardware version of touch sensor */ #define SOC_TOUCH_VERSION_2 (1) /*!<Hardware version of touch sensor */

4
components/soc/esp32s3/include/soc/Kconfig.soc_caps.in
View File

@@ -643,6 +643,10 @@ config SOC_TIMER_GROUP_SUPPORT_XTAL
bool bool
default y default y
config SOC_TIMER_GROUP_TOTAL_TIMERS
int
default 4
config SOC_TOUCH_SENSOR_NUM config SOC_TOUCH_SENSOR_NUM
int int
default 15 default 15

2
components/soc/esp32s3/include/soc/soc_caps.h
View File

@@ -238,7 +238,7 @@
#define SOC_TIMER_GROUP_TIMERS_PER_GROUP (2) #define SOC_TIMER_GROUP_TIMERS_PER_GROUP (2)
#define SOC_TIMER_GROUP_COUNTER_BIT_WIDTH (54) #define SOC_TIMER_GROUP_COUNTER_BIT_WIDTH (54)
#define SOC_TIMER_GROUP_SUPPORT_XTAL (1) #define SOC_TIMER_GROUP_SUPPORT_XTAL (1)
#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 -------------------------------*/ /*-------------------------- TOUCH SENSOR CAPS -------------------------------*/
#define SOC_TOUCH_SENSOR_NUM (15) /*! 15 Touch channels */ #define SOC_TOUCH_SENSOR_NUM (15) /*! 15 Touch channels */

4
components/soc/esp8684/include/soc/Kconfig.soc_caps.in
View File

@@ -411,6 +411,10 @@ config SOC_TIMER_GROUP_SUPPORT_XTAL
bool bool
default y default y
config SOC_TIMER_GROUP_TOTAL_TIMERS
int
default 1
config SOC_TOUCH_SENSOR_NUM config SOC_TOUCH_SENSOR_NUM
int int
default 0 default 0

2
components/soc/esp8684/include/soc/soc_caps.h
View File

@@ -211,7 +211,7 @@
#define SOC_TIMER_GROUP_TIMERS_PER_GROUP (1U) #define SOC_TIMER_GROUP_TIMERS_PER_GROUP (1U)
#define SOC_TIMER_GROUP_COUNTER_BIT_WIDTH (54) #define SOC_TIMER_GROUP_COUNTER_BIT_WIDTH (54)
#define SOC_TIMER_GROUP_SUPPORT_XTAL (1) #define SOC_TIMER_GROUP_SUPPORT_XTAL (1)
#define SOC_TIMER_GROUP_TOTAL_TIMERS (SOC_TIMER_GROUPS * SOC_TIMER_GROUP_TIMERS_PER_GROUP) #define SOC_TIMER_GROUP_TOTAL_TIMERS (1U)
/*-------------------------- TOUCH SENSOR CAPS -------------------------------*/ /*-------------------------- TOUCH SENSOR CAPS -------------------------------*/
#define SOC_TOUCH_SENSOR_NUM (0U) /*! No touch sensors on ESP8684 */ #define SOC_TOUCH_SENSOR_NUM (0U) /*! No touch sensors on ESP8684 */