michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: watchdog: esp32: enabled esp32c3

Browse source 
support for the unified esp32 wdt driver.

Signed-off-by: Felipe Neves <felipe.neves@espressif.com>
This commit is contained in:
Felipe Neves 2021-11-03 20:51:35 -03:00 • committed by Christopher Friedt
commit 857a188c76
4 changed files with 49 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
boards/riscv/esp32c3_devkitm/esp32c3_devkitm.dts
View file

@ -69,6 +69,10 @@
status = "okay";
};
&wdt0 {
status = "okay";
};
&flash0 {
status = "okay";
partitions {

2
drivers/watchdog/Kconfig.esp32
View file

@ -7,7 +7,7 @@ DT_COMPAT_ESP32_WDT := espressif,esp32-watchdog
config WDT_ESP32
bool "ESP32 Watchdog (WDT) Driver"
depends on SOC_ESP32 || SOC_ESP32S2
depends on SOC_ESP32 || SOC_ESP32S2 || SOC_ESP32C3
default $(dt_compat_enabled,$(DT_COMPAT_ESP32_WDT))
help
Enable WDT driver for ESP32.

27
drivers/watchdog/wdt_esp32.c
View file

@ -12,9 +12,19 @@
#include <string.h>
#include <drivers/watchdog.h>
#ifndef CONFIG_SOC_ESP32C3
#include <drivers/interrupt_controller/intc_esp32.h>
#else
#include <drivers/interrupt_controller/intc_esp32c3.h>
#endif
#include <device.h>
#ifdef CONFIG_SOC_ESP32C3
#define ISR_HANDLER isr_handler_t
#else
#define ISR_HANDLER intr_handler_t
#endif
/* FIXME: This struct shall be removed from here, when esp32 timer driver got
* implemented.
* That's why the type name starts with `timer` not `wdt`
@ -150,15 +160,23 @@ static int wdt_esp32_set_config(const struct device *dev, uint8_t options)
v |= TIMG_WDT_STG_SEL_OFF << TIMG_WDT_STG1_S;
/* Disable interrupts for this mode. */
#ifndef CONFIG_SOC_ESP32C3
v &= ~(TIMG_WDT_LEVEL_INT_EN | TIMG_WDT_EDGE_INT_EN);
#else
v &= ~(TIMG_WDT_INT_ENA);
#endif
} else if (data->mode == WDT_MODE_INTERRUPT_RESET) {
/* Interrupt first, and warm reset if not reloaded */
v |= TIMG_WDT_STG_SEL_INT << TIMG_WDT_STG0_S;
v |= TIMG_WDT_STG_SEL_RESET_SYSTEM << TIMG_WDT_STG1_S;
/* Use level-triggered interrupts. */
#ifndef CONFIG_SOC_ESP32C3
v |= TIMG_WDT_LEVEL_INT_EN;
v &= ~TIMG_WDT_EDGE_INT_EN;
#else
v |= TIMG_WDT_INT_ENA;
#endif
} else {
return -EINVAL;
}
@ -206,10 +224,15 @@ static int wdt_esp32_init(const struct device *dev)
wdt_esp32_disable(dev);
#endif
/* This is a level 4 interrupt, which is handled by _Level4Vector,
/* For xtensa esp32 chips, this is a level 4 interrupt,
* which is handled by _Level4Vector,
* located in xtensa_vectors.S.
*/
data->irq_line = esp_intr_alloc(config->irq_source, 0, wdt_esp32_isr, (void *)dev, NULL);
data->irq_line = esp_intr_alloc(config->irq_source,
0,
(ISR_HANDLER)wdt_esp32_isr,
(void *)dev,
NULL);
wdt_esp32_enable(dev);

19
dts/riscv/espressif/esp32c3.dtsi
View file

@ -153,6 +153,25 @@
status = "disabled";
use-iomux;
};
wdt0: watchdog@6001f048 {
compatible = "espressif,esp32-watchdog";
reg = <0x6001f048 0x20>;
interrupts = <TG0_WDT_LEVEL_INTR_SOURCE>;
interrupt-parent = <&intc>;
label = "WDT_0";
status = "disabled";
};
wdt1: watchdog@60020048 {
compatible = "espressif,esp32-watchdog";
reg = <0x60020048 0x20>;
interrupts = <TG1_WDT_LEVEL_INTR_SOURCE>;
interrupt-parent = <&intc>;
label = "WDT_1";
status = "disabled";
};
};
};