Skip to content

Commit 1b2ee6d

Browse files
committed
Do not keep TIMG0 on when timebase is systimer
1 parent 47508f3 commit 1b2ee6d

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
-8
lines changed

esp-metadata/devices/esp32c2.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ clocks = { system_clocks = { clock_tree = [
198198
{ name = "Systimer", keep_enabled = true },
199199
{ name = "ApbSarAdc", template_params = { peripheral = "apb_saradc" } },
200200
{ name = "UartMem", keep_enabled = true }, # TODO: keep_enabled can be removed once esp-println needs explicit initialization
201-
{ name = "Timg0", template_params = { peripheral = "timergroup" }, keep_enabled = true },
201+
{ name = "Timg0", template_params = { peripheral = "timergroup" } },
202202
{ name = "Ledc" },
203203
{ name = "I2cExt0" },
204204
{ name = "Spi2" },

esp-metadata/devices/esp32c3.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ clocks = { system_clocks = { clock_tree = [
225225
{ name = "I2s0" },
226226
{ name = "Twai0", template_params = { peripheral = "twai" } },
227227
{ name = "Timg1", template_params = { peripheral = "timergroup1" } },
228-
{ name = "Timg0", template_params = { peripheral = "timergroup" }, keep_enabled = true },
228+
{ name = "Timg0", template_params = { peripheral = "timergroup" } },
229229
{ name = "Ledc" },
230230
{ name = "Rmt" },
231231
{ name = "Uhci0" },

esp-metadata/devices/esp32c5.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ clocks = { system_clocks = { clock_tree = [
260260
], peripheral_clocks = [
261261
{ name = "Uart0", template_params = { conf_register = "uart(0).conf", clk_en_field = "clk_en", rst_field = "rst_en" }, keep_enabled = true},
262262
{ name = "Uart1", template_params = { conf_register = "uart(1).conf", clk_en_field = "clk_en", rst_field = "rst_en" } },
263-
{ name = "Timg0", template_params = { conf_register = "timergroup(0).conf", clk_en_field = "clk_en", rst_field = "rst_en" }, keep_enabled = true },
263+
{ name = "Timg0", template_params = { conf_register = "timergroup(0).conf", clk_en_field = "clk_en", rst_field = "rst_en" } },
264264
{ name = "Timg1", template_params = { conf_register = "timergroup(1).conf", clk_en_field = "clk_en", rst_field = "rst_en" } },
265265
{ name = "I2cExt0", template_params = { peripheral = "i2c0" } },
266266
{ name = "Pcnt" },

esp-metadata/devices/esp32c6.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ clocks = { system_clocks = { clock_tree = [
278278
{ name = "Uhci0", template_params = { peripheral = "uhci" } },
279279
{ name = "Rmt" },
280280
{ name = "Ledc" },
281-
{ name = "Timg0", template_params = { conf_register = "timergroup(0).conf", clk_en_field = "clk_en", rst_field = "rst_en" }, keep_enabled = true },
281+
{ name = "Timg0", template_params = { conf_register = "timergroup(0).conf", clk_en_field = "clk_en", rst_field = "rst_en" } },
282282
{ name = "Timg1", template_params = { conf_register = "timergroup(1).conf", clk_en_field = "clk_en", rst_field = "rst_en" } },
283283
{ name = "Systimer", keep_enabled = true },
284284
{ name = "Twai0", template_params = { clk_en_template = "{{default_clk_en_template}} {{func_clk_template}}", func_clk_template = "{{control}}::regs().twai0_func_clk_conf().modify(|_, w| w.twai0_func_clk_en().bit(enable));" } },

esp-metadata/devices/esp32c61.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ clocks = { system_clocks = { clock_tree = [
182182
], peripheral_clocks = [
183183
{ name = "Uart0", template_params = { conf_register = "uart(0).conf", clk_en_field = "clk_en", rst_field = "rst_en" }, keep_enabled = true },
184184
{ name = "Uart1", template_params = { conf_register = "uart(1).conf", clk_en_field = "clk_en", rst_field = "rst_en" } },
185-
{ name = "Timg0", template_params = { conf_register = "timergroup(0).conf", clk_en_field = "clk_en", rst_field = "rst_en" }, keep_enabled = true },
185+
{ name = "Timg0", template_params = { conf_register = "timergroup(0).conf", clk_en_field = "clk_en", rst_field = "rst_en" } },
186186
{ name = "Timg1", template_params = { conf_register = "timergroup(1).conf", clk_en_field = "clk_en", rst_field = "rst_en" } },
187187

188188
{ name = "Systimer", template_params = { peripheral = "systimer" }, keep_enabled = true },

esp-metadata/devices/esp32h2.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ clocks = { system_clocks = { clock_tree = [
232232
{ name = "Uhci0", template_params = { peripheral = "uhci" } },
233233
{ name = "Rmt" },
234234
{ name = "Ledc" },
235-
{ name = "Timg0", template_params = { conf_register = "timergroup(0).conf", clk_en_field = "clk_en", rst_field = "rst_en" }, keep_enabled = true },
235+
{ name = "Timg0", template_params = { conf_register = "timergroup(0).conf", clk_en_field = "clk_en", rst_field = "rst_en" } },
236236
{ name = "Timg1", template_params = { conf_register = "timergroup(1).conf", clk_en_field = "clk_en", rst_field = "rst_en" } },
237237
{ name = "Systimer", keep_enabled = true },
238238
{ name = "Twai0", template_params = { clk_en_template = "{{default_clk_en_template}} {{func_clk_template}}", func_clk_template = "{{control}}::regs().twai0_func_clk_conf().modify(|_, w| w.twai0_func_clk_en().bit(enable));" } },

esp-metadata/devices/esp32s2.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ clocks = { system_clocks = { clock_tree = [
238238
{ name = "Spi3" },
239239
{ name = "Timg1", template_params = { peripheral = "timergroup1" } },
240240
#{ name = "Efuse" },
241-
{ name = "Timg0", template_params = { peripheral = "timergroup" }, keep_enabled = true },
241+
{ name = "Timg0", template_params = { peripheral = "timergroup" } },
242242
{ name = "Uhci1" },
243243
{ name = "Ledc" },
244244
{ name = "Pcnt" },

esp-metadata/devices/esp32s3.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ clocks = { system_clocks = { clock_tree = [
261261
{ name = "Mcpwm0", template_params = { peripheral = "pwm0" } },
262262
{ name = "Spi3" },
263263
{ name = "Timg1", template_params = { peripheral = "timergroup1" } },
264-
{ name = "Timg0", template_params = { peripheral = "timergroup" }, keep_enabled = true },
264+
{ name = "Timg0", template_params = { peripheral = "timergroup" } },
265265
{ name = "Ledc" },
266266
{ name = "Pcnt" },
267267
{ name = "Rmt" },

0 commit comments

Comments
 (0)