Skip to content

Commit b8b845a

Browse files
committed
Merge branch 'change/remove_sdm_and_glitch_filter_on_c61' into 'master'
Change(sdm,glitch_filter): remove sdm and glitch filter on c61 Closes IDF-9340 and IDF-9335 See merge request espressif/esp-idf!32691
2 parents d60eb86 + a1fc225 commit b8b845a

File tree

3 files changed

+6
-18
lines changed

3 files changed

+6
-18
lines changed

components/soc/esp32c61/include/soc/Kconfig.soc_caps.in

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,10 @@ config SOC_GPIO_PIN_COUNT
227227
int
228228
default 22
229229

230+
config SOC_GPIO_SUPPORT_PIN_GLITCH_FILTER
231+
bool
232+
default y
233+
230234
config SOC_GPIO_SUPPORT_RTC_INDEPENDENT
231235
bool
232236
default y

components/soc/esp32c61/include/soc/clk_tree_defs.h

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -258,22 +258,6 @@ typedef enum {
258258
SPI_CLK_SRC_RC_FAST = SOC_MOD_CLK_RC_FAST, /*!< Select RC_FAST as SPI source clock */
259259
} soc_periph_spi_clk_src_t;
260260

261-
//////////////////////////////////////////////////SDM//////////////////////////////////////////////////////////////
262-
263-
/**
264-
* @brief Array initializer for all supported clock sources of SDM
265-
*/
266-
#define SOC_SDM_CLKS {SOC_MOD_CLK_PLL_F80M, SOC_MOD_CLK_XTAL}
267-
268-
/**
269-
* @brief Sigma Delta Modulator clock source
270-
*/
271-
typedef enum {
272-
SDM_CLK_SRC_XTAL = SOC_MOD_CLK_XTAL, /*!< Select XTAL clock as the source clock */
273-
SDM_CLK_SRC_PLL_F80M = SOC_MOD_CLK_PLL_F80M, /*!< Select PLL_F80M clock as the source clock */
274-
SDM_CLK_SRC_DEFAULT = SOC_MOD_CLK_PLL_F80M, /*!< Select PLL_F80M clock as the default clock choice */
275-
} soc_periph_sdm_clk_src_t;
276-
277261
//////////////////////////////////////////////////GPIO Glitch Filter////////////////////////////////////////////////////
278262

279263
/**

components/soc/esp32c61/include/soc/soc_caps.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,10 +161,10 @@
161161
// ESP32-C61 has 1 GPIO peripheral
162162
#define SOC_GPIO_PORT 1U
163163
#define SOC_GPIO_PIN_COUNT 22
164-
// \#define SOC_GPIO_SUPPORT_PIN_GLITCH_FILTER 1 //TODO: [ESP32C61] IDF-9340
164+
#define SOC_GPIO_SUPPORT_PIN_GLITCH_FILTER 1
165165

166166
// GPIO peripheral has the ETM extension
167-
// \#define SOC_GPIO_SUPPORT_ETM 1 //TODO: [ESP32C61] IDF-9340
167+
// \#define SOC_GPIO_SUPPORT_ETM 1 //TODO: [ESP32C61] IDF-9318
168168

169169
// Target has the full LP IO subsystem
170170
// On ESP32-C61, Digital IOs have their own registers to control pullup/down capability, independent of LP registers.

0 commit comments

Comments
 (0)