alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-11-03 22:08:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_bit_error_in_ledc_struct_backport_v4.3' into 'release/v4.3'

Browse Source 
LEDC: fix bit error in ledc_struct.h(backport v4.3)

See merge request espressif/esp-idf!14162
This commit is contained in:
Michael (XIAO Xufeng)
2021-10-14 17:41:00 +00:00
parent ce9e615679 d4d308d580
commit 5875b03266
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/soc/esp32s2/include/soc/ledc_struct.h
View File

@@ -30,8 +30,7 @@ typedef volatile struct ledc_dev_s {
uint32_t ovf_cnt_en: 1; uint32_t ovf_cnt_en: 1;
uint32_t ovf_cnt_rst: 1; uint32_t ovf_cnt_rst: 1;
uint32_t ovf_cnt_rst_st: 1; uint32_t ovf_cnt_rst_st: 1;
uint32_t reserved18: 13; uint32_t reserved18: 14;
uint32_t clk_en: 1; /*This bit is clock gating control signal. when software configure LED_PWM internal registers it controls the register clock.*/
}; };
uint32_t val; uint32_t val;
} conf0; } conf0;
@@ -198,7 +197,8 @@ typedef volatile struct ledc_dev_s {
union { union {
struct { struct {
uint32_t apb_clk_sel: 2; // 0:invalid; 1:80MHz APB clock; 2:8MHz RTC clock; 3:XTAL clock uint32_t apb_clk_sel: 2; // 0:invalid; 1:80MHz APB clock; 2:8MHz RTC clock; 3:XTAL clock
uint32_t reserved2: 30; uint32_t reserved2: 29;
uint32_t clk_en: 1; /*This bit is clock gating control signal. when software configure LED_PWM internal registers it controls the register clock.*/
}; };
uint32_t val; uint32_t val;
} conf; } conf;