Do not keep TIMG0 on when timebase is systimer

bugadani · bugadani · commit 4db887dfd11a · 2026-03-26T15:29:48.000+01:00
diff --git a/esp-metadata-generated/src/_generated_esp32c2.rs b/esp-metadata-generated/src/_generated_esp32c2.rs
@@ -2599,8 +2599,7 @@ macro_rules! implement_peripheral_clocks {
             UartMem,
         }
         impl Peripheral {
-            const KEEP_ENABLED: &[Peripheral] =
-                &[Self::Systimer, Self::Timg0, Self::Uart0, Self::UartMem];
+            const KEEP_ENABLED: &[Peripheral] = &[Self::Systimer, Self::Uart0, Self::UartMem];
             const COUNT: usize = Self::ALL.len();
             const ALL: &[Self] = &[
                 Self::ApbSarAdc,
diff --git a/esp-metadata-generated/src/_generated_esp32c3.rs b/esp-metadata-generated/src/_generated_esp32c3.rs
@@ -2877,13 +2877,8 @@ macro_rules! implement_peripheral_clocks {
             UsbDevice,
         }
         impl Peripheral {
-            const KEEP_ENABLED: &[Peripheral] = &[
-                Self::Systimer,
-                Self::Timg0,
-                Self::Uart0,
-                Self::UartMem,
-                Self::UsbDevice,
-            ];
+            const KEEP_ENABLED: &[Peripheral] =
+                &[Self::Systimer, Self::Uart0, Self::UartMem, Self::UsbDevice];
             const COUNT: usize = Self::ALL.len();
             const ALL: &[Self] = &[
                 Self::Aes,
diff --git a/esp-metadata-generated/src/_generated_esp32c5.rs b/esp-metadata-generated/src/_generated_esp32c5.rs
@@ -3069,7 +3069,6 @@ macro_rules! implement_peripheral_clocks {
             const KEEP_ENABLED: &[Peripheral] = &[
                 Self::ApbSarAdc,
                 Self::Systimer,
-                Self::Timg0,
                 Self::Uart0,
                 Self::UsbDevice,
             ];
diff --git a/esp-metadata-generated/src/_generated_esp32c6.rs b/esp-metadata-generated/src/_generated_esp32c6.rs
@@ -3713,7 +3713,6 @@ macro_rules! implement_peripheral_clocks {
             const KEEP_ENABLED: &[Peripheral] = &[
                 Self::ApbSarAdc,
                 Self::Systimer,
-                Self::Timg0,
                 Self::Uart0,
                 Self::UsbDevice,
             ];
diff --git a/esp-metadata-generated/src/_generated_esp32c61.rs b/esp-metadata-generated/src/_generated_esp32c61.rs
@@ -1953,7 +1953,7 @@ macro_rules! implement_peripheral_clocks {
             Uart1,
         }
         impl Peripheral {
-            const KEEP_ENABLED: &[Peripheral] = &[Self::Systimer, Self::Timg0, Self::Uart0];
+            const KEEP_ENABLED: &[Peripheral] = &[Self::Systimer, Self::Uart0];
             const COUNT: usize = Self::ALL.len();
             const ALL: &[Self] = &[
                 Self::Systimer,
diff --git a/esp-metadata-generated/src/_generated_esp32h2.rs b/esp-metadata-generated/src/_generated_esp32h2.rs
@@ -2793,8 +2793,7 @@ macro_rules! implement_peripheral_clocks {
             UsbDevice,
         }
         impl Peripheral {
-            const KEEP_ENABLED: &[Peripheral] =
-                &[Self::Systimer, Self::Timg0, Self::Uart0, Self::UsbDevice];
+            const KEEP_ENABLED: &[Peripheral] = &[Self::Systimer, Self::Uart0, Self::UsbDevice];
             const COUNT: usize = Self::ALL.len();
             const ALL: &[Self] = &[
                 Self::Aes,
diff --git a/esp-metadata-generated/src/_generated_esp32s2.rs b/esp-metadata-generated/src/_generated_esp32s2.rs
@@ -2783,8 +2783,7 @@ macro_rules! implement_peripheral_clocks {
             Wdg,
         }
         impl Peripheral {
-            const KEEP_ENABLED: &[Peripheral] =
-                &[Self::Systimer, Self::Timg0, Self::Uart0, Self::UartMem];
+            const KEEP_ENABLED: &[Peripheral] = &[Self::Systimer, Self::Uart0, Self::UartMem];
             const COUNT: usize = Self::ALL.len();
             const ALL: &[Self] = &[
                 Self::Aes,
diff --git a/esp-metadata-generated/src/_generated_esp32s3.rs b/esp-metadata-generated/src/_generated_esp32s3.rs
@@ -2908,13 +2908,8 @@ macro_rules! implement_peripheral_clocks {
             UsbDevice,
         }
         impl Peripheral {
-            const KEEP_ENABLED: &[Peripheral] = &[
-                Self::Systimer,
-                Self::Timg0,
-                Self::Uart0,
-                Self::UartMem,
-                Self::UsbDevice,
-            ];
+            const KEEP_ENABLED: &[Peripheral] =
+                &[Self::Systimer, Self::Uart0, Self::UartMem, Self::UsbDevice];
             const COUNT: usize = Self::ALL.len();
             const ALL: &[Self] = &[
                 Self::Aes,
diff --git a/esp-metadata/devices/esp32c2.toml b/esp-metadata/devices/esp32c2.toml
@@ -198,7 +198,7 @@ clocks = { system_clocks = { clock_tree = [
     { name = "Systimer", keep_enabled = true },
     { name = "ApbSarAdc", template_params = { peripheral = "apb_saradc" } },
     { name = "UartMem", keep_enabled = true }, # TODO: keep_enabled can be removed once esp-println needs explicit initialization
-    { name = "Timg0", template_params = { peripheral = "timergroup" }, keep_enabled = true },
+    { name = "Timg0", template_params = { peripheral = "timergroup" } },
     { name = "Ledc" },
     { name = "I2cExt0" },
     { name = "Spi2" },
diff --git a/esp-metadata/devices/esp32c3.toml b/esp-metadata/devices/esp32c3.toml
@@ -225,7 +225,7 @@ clocks = { system_clocks = { clock_tree = [
     { name = "I2s0" },
     { name = "Twai0", template_params = { peripheral = "twai" } },
     { name = "Timg1", template_params = { peripheral = "timergroup1" } },
-    { name = "Timg0", template_params = { peripheral = "timergroup" }, keep_enabled = true },
+    { name = "Timg0", template_params = { peripheral = "timergroup" } },
     { name = "Ledc" },
     { name = "Rmt" },
     { name = "Uhci0" },
diff --git a/esp-metadata/devices/esp32c5.toml b/esp-metadata/devices/esp32c5.toml
@@ -260,7 +260,7 @@ clocks = { system_clocks = { clock_tree = [
 ], peripheral_clocks = [
     { name = "Uart0", template_params = { conf_register = "uart(0).conf", clk_en_field = "clk_en", rst_field = "rst_en" }, keep_enabled = true},
     { name = "Uart1", template_params = { conf_register = "uart(1).conf", clk_en_field = "clk_en", rst_field = "rst_en" } },
-    { name = "Timg0", template_params = { conf_register = "timergroup(0).conf", clk_en_field = "clk_en", rst_field = "rst_en" }, keep_enabled = true },
+    { name = "Timg0", template_params = { conf_register = "timergroup(0).conf", clk_en_field = "clk_en", rst_field = "rst_en" } },
     { name = "Timg1", template_params = { conf_register = "timergroup(1).conf", clk_en_field = "clk_en", rst_field = "rst_en" } },
     { name = "I2cExt0", template_params = { peripheral = "i2c0" } },
     { name = "Pcnt" },
diff --git a/esp-metadata/devices/esp32c6.toml b/esp-metadata/devices/esp32c6.toml
@@ -278,7 +278,7 @@ clocks = { system_clocks = { clock_tree = [
     { name = "Uhci0", template_params = { peripheral = "uhci" } },
     { name = "Rmt" },
     { name = "Ledc" },
-    { name = "Timg0", template_params = { conf_register = "timergroup(0).conf", clk_en_field = "clk_en", rst_field = "rst_en" }, keep_enabled = true },
+    { name = "Timg0", template_params = { conf_register = "timergroup(0).conf", clk_en_field = "clk_en", rst_field = "rst_en" } },
     { name = "Timg1", template_params = { conf_register = "timergroup(1).conf", clk_en_field = "clk_en", rst_field = "rst_en" } },
     { name = "Systimer", keep_enabled = true },
     { 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));" } },
diff --git a/esp-metadata/devices/esp32c61.toml b/esp-metadata/devices/esp32c61.toml
@@ -182,7 +182,7 @@ clocks = { system_clocks = { clock_tree = [
 ], peripheral_clocks = [
     { name = "Uart0", template_params = { conf_register = "uart(0).conf", clk_en_field = "clk_en", rst_field = "rst_en" }, keep_enabled = true },
     { name = "Uart1", template_params = { conf_register = "uart(1).conf", clk_en_field = "clk_en", rst_field = "rst_en" } },
-    { name = "Timg0", template_params = { conf_register = "timergroup(0).conf", clk_en_field = "clk_en", rst_field = "rst_en" }, keep_enabled = true },
+    { name = "Timg0", template_params = { conf_register = "timergroup(0).conf", clk_en_field = "clk_en", rst_field = "rst_en" } },
     { name = "Timg1", template_params = { conf_register = "timergroup(1).conf", clk_en_field = "clk_en", rst_field = "rst_en" } },
 
     { name = "Systimer", template_params = { peripheral = "systimer" }, keep_enabled = true },
diff --git a/esp-metadata/devices/esp32h2.toml b/esp-metadata/devices/esp32h2.toml
@@ -232,7 +232,7 @@ clocks = { system_clocks = { clock_tree = [
     { name = "Uhci0", template_params = { peripheral = "uhci" } },
     { name = "Rmt" },
     { name = "Ledc" },
-    { name = "Timg0", template_params = { conf_register = "timergroup(0).conf", clk_en_field = "clk_en", rst_field = "rst_en" }, keep_enabled = true },
+    { name = "Timg0", template_params = { conf_register = "timergroup(0).conf", clk_en_field = "clk_en", rst_field = "rst_en" } },
     { name = "Timg1", template_params = { conf_register = "timergroup(1).conf", clk_en_field = "clk_en", rst_field = "rst_en" } },
     { name = "Systimer", keep_enabled = true },
     { 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));" } },
diff --git a/esp-metadata/devices/esp32s2.toml b/esp-metadata/devices/esp32s2.toml
@@ -238,7 +238,7 @@ clocks = { system_clocks = { clock_tree = [
     { name = "Spi3" },
     { name = "Timg1", template_params = { peripheral = "timergroup1" } },
     #{ name = "Efuse" },
-    { name = "Timg0", template_params = { peripheral = "timergroup" }, keep_enabled = true },
+    { name = "Timg0", template_params = { peripheral = "timergroup" } },
     { name = "Uhci1" },
     { name = "Ledc" },
     { name = "Pcnt" },
diff --git a/esp-metadata/devices/esp32s3.toml b/esp-metadata/devices/esp32s3.toml
@@ -261,7 +261,7 @@ clocks = { system_clocks = { clock_tree = [
     { name = "Mcpwm0", template_params = { peripheral = "pwm0" } },
     { name = "Spi3" },
     { name = "Timg1", template_params = { peripheral = "timergroup1" } },
-    { name = "Timg0", template_params = { peripheral = "timergroup" }, keep_enabled = true },
+    { name = "Timg0", template_params = { peripheral = "timergroup" } },
     { name = "Ledc" },
     { name = "Pcnt" },
     { name = "Rmt" },

Original file line number	Diff line number	Diff line change
`@@ -1953,7 +1953,7 @@ macro_rules! implement_peripheral_clocks {`
`1953`	`1953`	`Uart1,`
`1954`	`1954`	`}`
`1955`	`1955`	`impl Peripheral {`
`1956`		`- const KEEP_ENABLED: &[Peripheral] = &[Self::Systimer, Self::Timg0, Self::Uart0];`
	`1956`	`+ const KEEP_ENABLED: &[Peripheral] = &[Self::Systimer, Self::Uart0];`
`1957`	`1957`	`const COUNT: usize = Self::ALL.len();`
`1958`	`1958`	`const ALL: &[Self] = &[`
`1959`	`1959`	`Self::Systimer,`