From e9d4e99a2ab23457473a89131b1f647b883d44bf Mon Sep 17 00:00:00 2001 From: wanckl Date: Thu, 29 Aug 2024 21:23:50 +0800 Subject: [PATCH] change(twai): removal c61 twai due to not exist --- .../soc/esp32c61/include/soc/clk_tree_defs.h | 15 --------------- .../soc/esp32c61/include/soc/pmu_icg_mapping.h | 4 ---- components/soc/esp32c61/include/soc/soc_caps.h | 10 ---------- docs/docs_not_updated/esp32c61.txt | 1 - 4 files changed, 30 deletions(-) diff --git a/components/soc/esp32c61/include/soc/clk_tree_defs.h b/components/soc/esp32c61/include/soc/clk_tree_defs.h index a95d428217..dcc5c77717 100644 --- a/components/soc/esp32c61/include/soc/clk_tree_defs.h +++ b/components/soc/esp32c61/include/soc/clk_tree_defs.h @@ -275,21 +275,6 @@ typedef enum { GLITCH_FILTER_CLK_SRC_DEFAULT = SOC_MOD_CLK_PLL_F80M, /*!< Select PLL_F80M clock as the default clock choice */ } soc_periph_glitch_filter_clk_src_t; -//////////////////////////////////////////////////TWAI////////////////////////////////////////////////////////////////// - -/** - * @brief Array initializer for all supported clock sources of TWAI - */ -#define SOC_TWAI_CLKS {SOC_MOD_CLK_XTAL} - -/** - * @brief TWAI clock source - */ -typedef enum { - TWAI_CLK_SRC_XTAL = SOC_MOD_CLK_XTAL, /*!< Select XTAL as the source clock */ - TWAI_CLK_SRC_DEFAULT = SOC_MOD_CLK_XTAL, /*!< Select XTAL as the default clock choice */ -} soc_periph_twai_clk_src_t; - //////////////////////////////////////////////////ADC/////////////////////////////////////////////////////////////////// /** diff --git a/components/soc/esp32c61/include/soc/pmu_icg_mapping.h b/components/soc/esp32c61/include/soc/pmu_icg_mapping.h index 08ac435ee7..4ca8294bd1 100644 --- a/components/soc/esp32c61/include/soc/pmu_icg_mapping.h +++ b/components/soc/esp32c61/include/soc/pmu_icg_mapping.h @@ -6,8 +6,6 @@ #pragma once -#define PMU_ICG_APB_ENA_CAN0 18 -#define PMU_ICG_APB_ENA_CAN1 19 #define PMU_ICG_APB_ENA_GDMA 1 #define PMU_ICG_APB_ENA_I2C 13 #define PMU_ICG_APB_ENA_I2S 4 @@ -30,8 +28,6 @@ #define PMU_ICG_APB_ENA_UART1 7 #define PMU_ICG_APB_ENA_UHCI 8 #define PMU_ICG_APB_ENA_USB_DEVICE 17 -#define PMU_ICG_FUNC_ENA_CAN0 31 -#define PMU_ICG_FUNC_ENA_CAN1 30 #define PMU_ICG_FUNC_ENA_I2C 29 #define PMU_ICG_FUNC_ENA_I2S_RX 2 #define PMU_ICG_FUNC_ENA_I2S_TX 7 diff --git a/components/soc/esp32c61/include/soc/soc_caps.h b/components/soc/esp32c61/include/soc/soc_caps.h index 7aa5e31bef..9811548760 100644 --- a/components/soc/esp32c61/include/soc/soc_caps.h +++ b/components/soc/esp32c61/include/soc/soc_caps.h @@ -58,8 +58,6 @@ // \#define SOC_RNG_SUPPORTED 1 //TODO: [ESP32C61] IDF-9236 #define SOC_MODEM_CLOCK_SUPPORTED 1 #define SOC_REG_I2C_SUPPORTED 1 - -// \#define SOC_TWAI_SUPPORTED 0 //TODO: [ESP32C61] IDF-9336 // \#define SOC_ETM_SUPPORTED 0 // \#define SOC_SDIO_SLAVE_SUPPORTED 0 // \#define SOC_PAU_SUPPORTED 0 @@ -349,14 +347,6 @@ /*--------------------------- WATCHDOG CAPS ---------------------------------------*/ // #define SOC_MWDT_SUPPORT_XTAL (1) -/*-------------------------- TWAI CAPS ---------------------------------------*/ -// #define SOC_TWAI_CONTROLLER_NUM 2 -// #define SOC_TWAI_CLK_SUPPORT_XTAL 1 -// #define SOC_TWAI_BRP_MIN 2 -// #define SOC_TWAI_BRP_MAX 32768 -// #define SOC_TWAI_SUPPORTS_RX_STATUS 1 - - /*-------------------------- eFuse CAPS----------------------------*/ #define SOC_EFUSE_DIS_DOWNLOAD_ICACHE 0 #define SOC_EFUSE_DIS_PAD_JTAG 1 diff --git a/docs/docs_not_updated/esp32c61.txt b/docs/docs_not_updated/esp32c61.txt index dff26c6835..70eab7a362 100644 --- a/docs/docs_not_updated/esp32c61.txt +++ b/docs/docs_not_updated/esp32c61.txt @@ -78,7 +78,6 @@ api-reference/peripherals/isp.rst api-reference/peripherals/adc_continuous.rst api-reference/peripherals/adc_oneshot.rst api-reference/peripherals/usb_host.rst -api-reference/peripherals/twai.rst api-reference/peripherals/usb_host/usb_host_notes_arch.rst api-reference/peripherals/usb_host/usb_host_notes_index.rst api-reference/peripherals/usb_host/usb_host_notes_dwc_otg.rst