From b17712364cbc6753cb2c3796b7d581a21c06e04f Mon Sep 17 00:00:00 2001 From: Raffael Rostagno Date: Thu, 14 Mar 2024 16:45:57 -0300 Subject: [PATCH] drivers: systimer: Removed mention to ESP32C3 Removed mention to C3 SoC, so files are not SoC specific. Ready for C6 integration. Signed-off-by: Raffael Rostagno --- CODEOWNERS | 2 +- drivers/timer/CMakeLists.txt | 2 +- drivers/timer/Kconfig | 2 +- drivers/timer/{Kconfig.esp32c3_sys => Kconfig.esp32} | 6 +++--- drivers/timer/{esp32c3_sys_timer.c => esp32_sys_timer.c} | 0 soc/espressif/esp32c3/default.ld | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) rename drivers/timer/{Kconfig.esp32c3_sys => Kconfig.esp32} (83%) rename drivers/timer/{esp32c3_sys_timer.c => esp32_sys_timer.c} (100%) diff --git a/CODEOWNERS b/CODEOWNERS index 045a393f7d..0a30b6f34c 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -380,7 +380,7 @@ /drivers/timer/*leon_gptimer* @julius-barendt /drivers/timer/*mips_cp0* @frantony /drivers/timer/*rcar_cmt* @aaillet -/drivers/timer/*esp32c3_sys* @uLipe +/drivers/timer/*esp32_sys* @uLipe /drivers/timer/*sam0_rtc* @bendiscz /drivers/timer/*arcv2* @ruuddw /drivers/timer/*xtensa* @dcpleung diff --git a/drivers/timer/CMakeLists.txt b/drivers/timer/CMakeLists.txt index 36534e4716..10edb91416 100644 --- a/drivers/timer/CMakeLists.txt +++ b/drivers/timer/CMakeLists.txt @@ -11,7 +11,7 @@ zephyr_library_sources_ifdef(CONFIG_ARM_ARCH_TIMER arm_arch_timer.c) zephyr_library_sources_ifdef(CONFIG_INTEL_ADSP_TIMER intel_adsp_timer.c) zephyr_library_sources_ifdef(CONFIG_CC13XX_CC26XX_RTC_TIMER cc13xx_cc26xx_rtc_timer.c) zephyr_library_sources_ifdef(CONFIG_CORTEX_M_SYSTICK cortex_m_systick.c) -zephyr_library_sources_ifdef(CONFIG_ESP32C3_SYS_TIMER esp32c3_sys_timer.c) +zephyr_library_sources_ifdef(CONFIG_ESP32_SYS_TIMER esp32_sys_timer.c) zephyr_library_sources_ifdef(CONFIG_GECKO_BURTC_TIMER gecko_burtc_timer.c) zephyr_library_sources_ifdef(CONFIG_HPET_TIMER hpet.c) zephyr_library_sources_ifdef(CONFIG_ITE_IT8XXX2_TIMER ite_it8xxx2_timer.c) diff --git a/drivers/timer/Kconfig b/drivers/timer/Kconfig index f20442dd2c..317efd71d8 100644 --- a/drivers/timer/Kconfig +++ b/drivers/timer/Kconfig @@ -71,7 +71,7 @@ source "drivers/timer/Kconfig.arm_arch" source "drivers/timer/Kconfig.cavs" source "drivers/timer/Kconfig.cc13xx_cc26xx_rtc" source "drivers/timer/Kconfig.cortex_m_systick" -source "drivers/timer/Kconfig.esp32c3_sys" +source "drivers/timer/Kconfig.esp32" source "drivers/timer/Kconfig.gecko" source "drivers/timer/Kconfig.ite_it8xxx2" source "drivers/timer/Kconfig.leon_gptimer" diff --git a/drivers/timer/Kconfig.esp32c3_sys b/drivers/timer/Kconfig.esp32 similarity index 83% rename from drivers/timer/Kconfig.esp32c3_sys rename to drivers/timer/Kconfig.esp32 index 366cfcd852..0d45987c72 100644 --- a/drivers/timer/Kconfig.esp32c3_sys +++ b/drivers/timer/Kconfig.esp32 @@ -3,12 +3,12 @@ # Copyright (c) 2019 Intel Corp. # SPDX-License-Identifier: Apache-2.0 -config ESP32C3_SYS_TIMER - bool "ESP32C3 sys-timer support" +config ESP32_SYS_TIMER + bool "ESP32 sys-timer support (ESP32Cx series)" depends on SOC_SERIES_ESP32C3 default y select TICKLESS_CAPABLE select TIMER_HAS_64BIT_CYCLE_COUNTER help - This option enables the system timer driver for the Espressif ESP32C3 + This option enables the system timer driver for the Espressif ESP32Cx and provides the standard "system clock driver" interface. diff --git a/drivers/timer/esp32c3_sys_timer.c b/drivers/timer/esp32_sys_timer.c similarity index 100% rename from drivers/timer/esp32c3_sys_timer.c rename to drivers/timer/esp32_sys_timer.c diff --git a/soc/espressif/esp32c3/default.ld b/soc/espressif/esp32c3/default.ld index 65984b4fd7..4de4bd310d 100644 --- a/soc/espressif/esp32c3/default.ld +++ b/soc/espressif/esp32c3/default.ld @@ -238,7 +238,7 @@ SECTIONS *libdrivers__flash.a:flash_esp32.*(.literal .text .literal.* .text.*) *libzephyr.a:spi_flash_rom_patch.*(.literal .text .literal.* .text.*) *libzephyr.a:log_noos.*(.literal .text .literal.* .text.*) - *libdrivers__timer.a:esp32c3_sys_timer.*(.literal .text .literal.* .text.*) + *libdrivers__timer.a:esp32_sys_timer.*(.literal .text .literal.* .text.*) *libzephyr.a:log_core.*(.literal .text .literal.* .text.*) *libzephyr.a:cbprintf_complete.*(.literal .text .literal.* .text.*) *libzephyr.a:printk.*(.literal.printk .literal.vprintk .literal.char_out .text.printk .text.vprintk .text.char_out)