cpu/esp32: changes to use ESP-IDF HAL/LL API

boards/common/esp32/board_common.c

@@ -30,10 +30,6 @@
 extern "C" {
 #endif
 
-void board_init_common(void)
-{
-}
-
 extern void adc_print_config(void);
 extern void dac_print_config(void);
 extern void pwm_print_config(void);

boards/common/esp32/include/board_common.h

@@ -147,13 +147,6 @@ extern mtd_dev_t *mtd0;
 /** @} */
 #endif /* MODULE_SPIFFS || DOXYGEN */
 
-/**
- * @brief Initialize the hardware that is common for all ESP32 boards.
- *
- * This function has to be called from the board specific `board_init` function.
- */
-void board_init_common(void);
-
 /**
   * @brief Print the board configuration in a human readable format
   */
@@ -171,9 +164,6 @@ void print_board_config(void);
 extern "C"
 #endif
 
-/* declaration of `board_init_common` is required when compiling vendor code */
-extern void board_init_common(void);
-
 #ifdef __cplusplus
 }
 #endif

boards/common/esp32/include/periph_conf_common.h

@@ -100,24 +100,48 @@ static const gpio_t dac_channels[] = DAC_GPIOS;
  * @{
  */
 
+#if defined(I2C0_SCL) && !defined(I2C0_SCL_PULLUP)
+/** Define SCL pullup enabled by default */
+#define I2C0_SCL_PULLUP true
+#endif
+#if defined(I2C0_SDA) && !defined(I2C0_SDA_PULLUP)
+/** Define SDA pullup enabled by default */
+#define I2C0_SDA_PULLUP true
+#endif
+
+#if defined(I2C1_SCL) && !defined(I2C1_SCL_PULLUP)
+/** Define SCL pullup enabled by default */
+#define I2C1_SCL_PULLUP true
+#endif
+#if defined(I2C1_SDA) && !defined(I2C1_SDA_PULLUP)
+/** Define SDA pullup enabled by default */
+#define I2C1_SDA_PULLUP true
+#endif
+
 /**
  * @brief   Static array with configuration for declared I2C devices
  */
 static const i2c_conf_t i2c_config[] = {
-    #if defined(I2C0_SCL) && defined(I2C0_SDA) && defined(I2C0_SPEED)
+#if defined(I2C0_SCL) && defined(I2C0_SDA) && defined(I2C0_SPEED)
     {
+        .module = PERIPH_I2C0_MODULE,
         .speed = I2C0_SPEED,
         .scl = I2C0_SCL,
         .sda = I2C0_SDA,
+        .scl_pullup = I2C0_SCL_PULLUP,
+        .sda_pullup = I2C0_SCL_PULLUP,
     },
-    #endif
-    #if defined(I2C1_SCL) && defined(I2C1_SDA) && defined(I2C1_SPEED)
+#endif
+#if defined(I2C1_SCL) && defined(I2C1_SDA) && defined(I2C1_SPEED)
     {
+        .module = PERIPH_I2C1_MODULE,
         .speed = I2C1_SPEED,
         .scl = I2C1_SCL,
         .sda = I2C1_SDA,
+        .scl_pullup = I2C1_SCL_PULLUP,
+        .sda_pullup = I2C1_SCL_PULLUP,
     },
-    #endif
+#endif
 };
 
 /**
@@ -138,33 +162,92 @@ static const i2c_conf_t i2c_config[] = {
  */
 
 /**
- * @brief   Static array of GPIOs that can be used as channels of PWM0
+ * @brief   GPIOs used as channels for the according PWM device
  */
 #ifdef PWM0_GPIOS
-static const gpio_t pwm0_channels[] = PWM0_GPIOS;
+static const gpio_t pwm0_gpios[] = PWM0_GPIOS;
 #endif
+
 /**
- * @brief   Static array of GPIOs that can be used as channels of PWM0
+ * @brief   GPIOs used as channels for the according PWM device
  */
 #ifdef PWM1_GPIOS
-static const gpio_t pwm1_channels[] = PWM1_GPIOS;
+static const gpio_t pwm1_gpios[] = PWM1_GPIOS;
+#endif
+
+/**
+ * @brief   GPIOs used as channels for the according PWM device
+ */
+#ifdef PWM2_GPIOS
+static const gpio_t pwm2_gpios[] = PWM2_GPIOS;
+#endif
+
+/**
+ * @brief   GPIOs used as channels for the according PWM device
+ */
+#ifdef PWM3_GPIOS
+static const gpio_t pwm3_gpios[] = PWM3_GPIOS;
 #endif
 
+/**
+ * @brief   PWM device configuration based on defined PWM channel GPIOs
+ */
+static const pwm_config_t pwm_config[] =
+{
+#ifdef PWM0_GPIOS
+    {
+        .module = PERIPH_LEDC_MODULE,
+        .group = LEDC_LOW_SPEED_MODE,
+        .timer = LEDC_TIMER_0,
+        .ch_numof = ARRAY_SIZE(pwm0_gpios),
+        .gpios = pwm0_gpios,
+    },
+#endif
+#ifdef PWM1_GPIOS
+    {
+        .module = PERIPH_LEDC_MODULE,
+#ifdef SOC_LEDC_SUPPORT_HS_MODE
+        .group = LEDC_HIGH_SPEED_MODE,
+#else
+        .group = LEDC_LOW_SPEED_MODE,
+#endif
+        .timer = LEDC_TIMER_1,
+        .ch_numof = ARRAY_SIZE(pwm1_gpios),
+        .gpios = pwm1_gpios,
+    },
+#endif
+#ifdef PWM2_GPIOS
+    {
+        .module = PERIPH_LEDC_MODULE,
+        .group = LEDC_LOW_SPEED_MODE,
+        .timer = LEDC_TIMER_2,
+        .ch_numof = ARRAY_SIZE(pwm2_gpios),
+        .gpios = pwm2_gpios,
+    },
+#endif
+#ifdef PWM3_GPIOS
+    {
+        .module = PERIPH_LEDC_MODULE,
+#ifdef SOC_LEDC_SUPPORT_HS_MODE
+        .group = LEDC_HIGH_SPEED_MODE,
+#else
+        .group = LEDC_LOW_SPEED_MODE,
+#endif
+        .timer = LEDC_TIMER_3,
+        .ch_numof = ARRAY_SIZE(pwm3_gpios),
+        .gpios = pwm3_gpios,
+    },
+#endif
+};
+
 /**
  * @brief   Number of PWM devices
  *
- * The number of PWM devices is determined from the PWM0_GPIOS and PWM1_GPIOS
- * definitions.
+ * The number of PWM devices is determined from the PWM device configuration.
  *
  * @note PWM_NUMOF definition must not be changed.
  */
-#if defined(PWM0_GPIOS) && defined(PWM1_GPIOS)
-#define PWM_NUMOF  (2)
-#elif defined(PWM0_GPIOS) || defined(PWM1_GPIOS)
-#define PWM_NUMOF  (1)
-#else
-#define PWM_NUMOF  (0)
-#endif
+#define PWM_NUMOF   ARRAY_SIZE(pwm_config)
 
 /** @} */
 
@@ -228,18 +311,18 @@ static const uart_conf_t uart_config[] = {
         .txd = UART0_TXD,
         .rxd = UART0_RXD,
     },
-    #if defined(UART1_TXD) && defined(UART1_RXD)
+#if defined(UART1_TXD) && defined(UART1_RXD)
     {
         .txd = UART1_TXD,
         .rxd = UART1_RXD,
     },
-    #endif
-    #if defined(UART2_TXD) && defined(UART2_RXD)
+#endif
+#if defined(UART2_TXD) && defined(UART2_RXD)
     {
         .txd = UART2_TXD,
         .rxd = UART2_RXD,
     },
-    #endif
+#endif
 };
 
 /**

boards/esp32-ethernet-kit-v1_0/include/periph_conf.h

@@ -88,10 +88,6 @@
 #endif
 #endif /* PWM0_GPIOS */
 
-/** PWM_DEV(1) is not used */
-#ifndef PWM1_GPIOS
-#define PWM1_GPIOS  { }
-#endif
 /** @} */
 
 /**

boards/esp32-mh-et-live-minikit/include/periph_conf.h

@@ -101,10 +101,6 @@
 #define PWM0_GPIOS { GPIO2, GPIO0, GPIO4, GPIO15 }
 #endif
 
-/** PWM_DEV(1) is not used */
-#ifndef PWM1_GPIOS
-#define PWM1_GPIOS  { }
-#endif
 /** @} */
 
 /**

boards/esp32-olimex-evb/include/periph_conf.h

@@ -134,14 +134,9 @@ extern "C" {
 #else
 #error Configuration problem: Flash mode qio or qout is used, \
        GPIO9 and GPIO10 cannot be used as PWM channels as configured
-#define PWM0_GPIOS { }
 #endif
 #endif
 
-/** PWM_DEV(1) is not used */
-#ifndef PWM1_GPIOS
-#define PWM1_GPIOS { }
-#endif
 /** @} */
 
 /**

boards/esp32-ttgo-t-beam/board.c

@@ -33,8 +33,6 @@
 
 void board_init(void)
 {
-    board_init_common();
-
 #if MODULE_ESP32_TTGO_T_BEAM_V1_0
     uint8_t reg;
 

boards/esp32-wemos-lolin-d32-pro/include/periph_conf.h

@@ -119,10 +119,6 @@
 #define PWM0_GPIOS { GPIO0, GPIO2 }
 #endif
 
-/** PWM_DEV(1) is not used */
-#ifndef PWM1_GPIOS
-#define PWM1_GPIOS  { }
-#endif
 /** @} */
 
 /**

boards/esp32-wrover-kit/board.c

@@ -23,7 +23,4 @@ void board_init(void)
 #if MODULE_ILI9341
     gpio_init(LCD_BACKLIGHT, GPIO_OUT);
 #endif
-
-    /* there is nothing special to initialize on this board */
-    board_init_common();
 }

boards/esp32-wrover-kit/include/periph_conf.h

@@ -127,10 +127,6 @@
 #endif
 #endif
 
-/** PWM_DEV(1) is not used */
-#ifndef PWM1_GPIOS
-#define PWM1_GPIOS  { }
-#endif
 /** @} */
 
 /**

cpu/esp32/Kconfig

@@ -15,8 +15,8 @@ config CPU_FAM_ESP32
     select CPU_CORE_XTENSA_LX6
     select HAS_ARCH_ESP32
     select HAS_CPU_ESP32
+    select HAS_ESP_HW_COUNTER
     select HAS_ESP_WIFI_ENTERPRISE
-    select HAS_PERIPH_ADC_CTRL
     select HAS_PUF_SRAM
 
     select PACKAGE_ESP32_SDK if TEST_KCONFIG
@@ -63,6 +63,11 @@ config HAS_CPU_ESP32
     help
         Indicates that the current CPU is 'esp32'.
 
+config HAS_ESP_HW_COUNTER
+    bool
+    help
+        Indicates that HW counters can be used.
+
 config HAS_ESP_RTC_TIMER_32K
     bool
     help
@@ -75,11 +80,6 @@ config HAS_ESP_SPI_RAM
         Indicates that an external RAM is connected via the FSPI interface in
         the board.
 
-config HAS_PERIPH_ADC_CTRL
-    bool
-    help
-        Indicates that an ESP32 ADC controller peripheral is present.
-
 ## Common CPU symbols
 config CPU_CORE
     default "xtensa-lx6" if CPU_CORE_XTENSA_LX6
@@ -120,7 +120,6 @@ menu "ESP32 specific configurations"
     config MODULE_ESP_SPI_RAM
         bool "SPI RAM support"
         depends on HAS_ESP_SPI_RAM
-        select MODULE_ESP_IDF_EFUSE
         select MODULE_ESP_IDF_GPIO
         select MODULE_ESP_IDF_HEAP
         select MODULE_ESP_IDF_SPI_FLASH
@@ -136,5 +135,6 @@ endmenu
 
 rsource "bootloader/Kconfig"
 rsource "esp-idf/Kconfig"
+rsource "esp-idf-api/Kconfig"
 rsource "periph/Kconfig"
 source "$(RIOTCPU)/esp_common/Kconfig"

cpu/esp32/Makefile

@@ -7,6 +7,7 @@ SRC = irq_arch.c startup.c syscalls.c
 DIRS += $(RIOTCPU)/esp_common
 DIRS += periph
 DIRS += esp-idf
+DIRS += esp-idf-api
 
 ifneq (, $(filter esp_bootloader, $(USEMODULE)))
     DIRS += bootloader