From 3290ffd370eb6004ff2456d91346a1a314e88eb7 Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Fri, 12 Feb 2021 10:58:39 +0100 Subject: [PATCH] boards/nrf5x-based: add vdd_lc_filer_regX feature --- boards/acd52832/include/periph_conf.h | 5 ----- boards/common/nrf52xxxdk/Makefile.features | 1 + boards/common/nrf52xxxdk/include/periph_conf_common.h | 5 ----- boards/common/particle-mesh/Makefile.features | 1 + boards/dwm1001/Makefile.features | 1 + boards/dwm1001/include/periph_conf.h | 5 ----- boards/microbit-v2/Makefile.features | 1 + boards/microbit-v2/include/periph_conf.h | 5 ----- boards/nrf51dk/Makefile.features | 1 + boards/nrf51dk/include/periph_conf.h | 5 ----- boards/nrf52832-mdk/Makefile.features | 1 + boards/nrf52832-mdk/include/periph_conf.h | 5 ----- boards/nrf52840-mdk/Makefile.features | 1 + boards/nrf52840-mdk/include/periph_conf.h | 5 ----- boards/nrf52840dk/Makefile.features | 1 + boards/nrf52840dongle/Makefile.features | 2 ++ boards/nrf52840dongle/include/periph_conf.h | 7 ------- boards/particle-argon/include/periph_conf.h | 5 ----- boards/particle-boron/include/periph_conf.h | 5 ----- boards/particle-xenon/include/periph_conf.h | 5 ----- boards/pinetime/Makefile.features | 1 + boards/pinetime/include/periph_conf.h | 5 ----- boards/reel/Makefile.features | 1 + boards/reel/include/periph_conf.h | 5 ----- boards/ruuvitag/Makefile.features | 1 + boards/ruuvitag/include/periph_conf.h | 5 ----- boards/thingy52/Makefile.features | 1 + boards/thingy52/include/periph_conf.h | 5 ----- 28 files changed, 14 insertions(+), 77 deletions(-) diff --git a/boards/acd52832/include/periph_conf.h b/boards/acd52832/include/periph_conf.h index 2695da1c97..c17278166f 100644 --- a/boards/acd52832/include/periph_conf.h +++ b/boards/acd52832/include/periph_conf.h @@ -81,11 +81,6 @@ static const i2c_conf_t i2c_config[] = { #define I2C_NUMOF ARRAY_SIZE(i2c_config) /** @} */ -/** - * @brief Enable the internal DC/DC converter - */ -#define NRF5X_ENABLE_DCDC - #ifdef __cplusplus } #endif diff --git a/boards/common/nrf52xxxdk/Makefile.features b/boards/common/nrf52xxxdk/Makefile.features index b7d0742616..82dc2d8333 100644 --- a/boards/common/nrf52xxxdk/Makefile.features +++ b/boards/common/nrf52xxxdk/Makefile.features @@ -3,5 +3,6 @@ FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_pwm FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_uart +FEATURES_PROVIDED += vdd_lc_filter_reg1 include $(RIOTBOARD)/common/nrf52/Makefile.features diff --git a/boards/common/nrf52xxxdk/include/periph_conf_common.h b/boards/common/nrf52xxxdk/include/periph_conf_common.h index d4f9691d56..2de6c36ea0 100644 --- a/boards/common/nrf52xxxdk/include/periph_conf_common.h +++ b/boards/common/nrf52xxxdk/include/periph_conf_common.h @@ -68,11 +68,6 @@ static const pwm_conf_t pwm_config[] = { #define PWM_NUMOF ARRAY_SIZE(pwm_config) /** @} */ -/** - * @brief Enable the internal DC/DC converter - */ -#define NRF5X_ENABLE_DCDC - #ifdef __cplusplus } #endif diff --git a/boards/common/particle-mesh/Makefile.features b/boards/common/particle-mesh/Makefile.features index 76ed127b34..9ca1472a17 100644 --- a/boards/common/particle-mesh/Makefile.features +++ b/boards/common/particle-mesh/Makefile.features @@ -6,6 +6,7 @@ FEATURES_PROVIDED += periph_pwm FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_uart FEATURES_PROVIDED += periph_usbdev +FEATURES_PROVIDED += vdd_lc_filter_reg1 # Various other features (if any) diff --git a/boards/dwm1001/Makefile.features b/boards/dwm1001/Makefile.features index b26cc43445..2e76014f9a 100644 --- a/boards/dwm1001/Makefile.features +++ b/boards/dwm1001/Makefile.features @@ -4,5 +4,6 @@ CPU_MODEL = nrf52832xxaa FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_uart +FEATURES_PROVIDED += vdd_lc_filter_reg1 include $(RIOTBOARD)/common/nrf52/Makefile.features diff --git a/boards/dwm1001/include/periph_conf.h b/boards/dwm1001/include/periph_conf.h index ee40e2b297..de211c5ea5 100644 --- a/boards/dwm1001/include/periph_conf.h +++ b/boards/dwm1001/include/periph_conf.h @@ -77,11 +77,6 @@ static const i2c_conf_t i2c_config[] = { #define I2C_NUMOF ARRAY_SIZE(i2c_config) /** @} */ -/** - * @brief Enable the internal DC/DC converter - */ -#define NRF5X_ENABLE_DCDC - #ifdef __cplusplus } #endif diff --git a/boards/microbit-v2/Makefile.features b/boards/microbit-v2/Makefile.features index 259e50e560..63c0d07b90 100644 --- a/boards/microbit-v2/Makefile.features +++ b/boards/microbit-v2/Makefile.features @@ -5,6 +5,7 @@ FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_pwm FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_uart +FEATURES_PROVIDED += vdd_lc_filter_reg1 # include common nrf52 based boards features include $(RIOTBOARD)/common/nrf52/Makefile.features diff --git a/boards/microbit-v2/include/periph_conf.h b/boards/microbit-v2/include/periph_conf.h index b5b142514f..4644775133 100644 --- a/boards/microbit-v2/include/periph_conf.h +++ b/boards/microbit-v2/include/periph_conf.h @@ -29,11 +29,6 @@ extern "C" { #endif -/** - * @brief Enable the internal DC/DC converter - */ -#define NRF5X_ENABLE_DCDC - /** * @name UART configuration * @{ diff --git a/boards/nrf51dk/Makefile.features b/boards/nrf51dk/Makefile.features index 1fad69e560..bd3cdbeace 100644 --- a/boards/nrf51dk/Makefile.features +++ b/boards/nrf51dk/Makefile.features @@ -5,6 +5,7 @@ FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_uart FEATURES_PROVIDED += periph_uart_hw_fc +FEATURES_PROVIDED += vdd_lc_filter_reg1 # include common nrf51 based boards features include $(RIOTBOARD)/common/nrf51/Makefile.features diff --git a/boards/nrf51dk/include/periph_conf.h b/boards/nrf51dk/include/periph_conf.h index 152f9e7238..4399bd50b3 100644 --- a/boards/nrf51dk/include/periph_conf.h +++ b/boards/nrf51dk/include/periph_conf.h @@ -73,11 +73,6 @@ static const i2c_conf_t i2c_config[] = { #define I2C_NUMOF ARRAY_SIZE(i2c_config) /** @} */ -/** - * @brief Enable the internal DC/DC converter - */ -#define NRF5X_ENABLE_DCDC - #ifdef __cplusplus } #endif diff --git a/boards/nrf52832-mdk/Makefile.features b/boards/nrf52832-mdk/Makefile.features index f8e8dadfd9..3ac7472acb 100644 --- a/boards/nrf52832-mdk/Makefile.features +++ b/boards/nrf52832-mdk/Makefile.features @@ -3,5 +3,6 @@ CPU_MODEL = nrf52832xxaa # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_uart +FEATURES_PROVIDED += vdd_lc_filter_reg1 include $(RIOTBOARD)/common/nrf52/Makefile.features diff --git a/boards/nrf52832-mdk/include/periph_conf.h b/boards/nrf52832-mdk/include/periph_conf.h index 33ee816977..3983b7628a 100644 --- a/boards/nrf52832-mdk/include/periph_conf.h +++ b/boards/nrf52832-mdk/include/periph_conf.h @@ -40,11 +40,6 @@ extern "C" { #define UART_PIN_TX GPIO_PIN(0,20) /** @} */ -/** - * @brief Enable the internal DC/DC converter - */ -#define NRF5X_ENABLE_DCDC - #ifdef __cplusplus } #endif diff --git a/boards/nrf52840-mdk/Makefile.features b/boards/nrf52840-mdk/Makefile.features index e96ab8ee7c..2ed3d7f90c 100644 --- a/boards/nrf52840-mdk/Makefile.features +++ b/boards/nrf52840-mdk/Makefile.features @@ -5,6 +5,7 @@ FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_uart FEATURES_PROVIDED += periph_usbdev +FEATURES_PROVIDED += vdd_lc_filter_reg1 # Various other features (if any) diff --git a/boards/nrf52840-mdk/include/periph_conf.h b/boards/nrf52840-mdk/include/periph_conf.h index bbd16563ed..f40b5b3480 100644 --- a/boards/nrf52840-mdk/include/periph_conf.h +++ b/boards/nrf52840-mdk/include/periph_conf.h @@ -53,11 +53,6 @@ static const uart_conf_t uart_config[] = { #define UART_NUMOF ARRAY_SIZE(uart_config) /** @} */ -/** - * @brief Enable the internal DC/DC converter - */ -#define NRF5X_ENABLE_DCDC - #ifdef __cplusplus } #endif diff --git a/boards/nrf52840dk/Makefile.features b/boards/nrf52840dk/Makefile.features index fbed9c2b25..04c16f528b 100644 --- a/boards/nrf52840dk/Makefile.features +++ b/boards/nrf52840dk/Makefile.features @@ -5,3 +5,4 @@ include $(RIOTBOARD)/common/nrf52xxxdk/Makefile.features # Various other features (if any) FEATURES_PROVIDED += periph_pwm FEATURES_PROVIDED += periph_usbdev +FEATURES_PROVIDED += vdd_lc_filter_reg0 diff --git a/boards/nrf52840dongle/Makefile.features b/boards/nrf52840dongle/Makefile.features index bd678939fe..64d19406c7 100644 --- a/boards/nrf52840dongle/Makefile.features +++ b/boards/nrf52840dongle/Makefile.features @@ -4,6 +4,8 @@ CPU_MODEL = nrf52840xxaa FEATURES_PROVIDED += periph_pwm FEATURES_PROVIDED += periph_uart FEATURES_PROVIDED += periph_usbdev +FEATURES_PROVIDED += vdd_lc_filter_reg0 +FEATURES_PROVIDED += vdd_lc_filter_reg1 # Various other features (if any) FEATURES_PROVIDED += highlevel_stdio diff --git a/boards/nrf52840dongle/include/periph_conf.h b/boards/nrf52840dongle/include/periph_conf.h index ac8d460b34..3840c52ce1 100644 --- a/boards/nrf52840dongle/include/periph_conf.h +++ b/boards/nrf52840dongle/include/periph_conf.h @@ -71,13 +71,6 @@ static const pwm_conf_t pwm_config[] = { #define PWM_NUMOF ARRAY_SIZE(pwm_config) /** @} */ -/** - * @brief Enable the internal DC/DC converter - */ -#ifndef NRF5X_ENABLE_DCDC -#define NRF5X_ENABLE_DCDC 1 -#endif - #ifdef __cplusplus } #endif diff --git a/boards/particle-argon/include/periph_conf.h b/boards/particle-argon/include/periph_conf.h index 2057e7b174..51aa1e02b1 100644 --- a/boards/particle-argon/include/periph_conf.h +++ b/boards/particle-argon/include/periph_conf.h @@ -60,11 +60,6 @@ static const uart_conf_t uart_config[] = { #define UART_NUMOF ARRAY_SIZE(uart_config) /** @} */ -/** - * @brief Enable the internal DC/DC converter - */ -#define NRF5X_ENABLE_DCDC - #ifdef __cplusplus } #endif diff --git a/boards/particle-boron/include/periph_conf.h b/boards/particle-boron/include/periph_conf.h index 8bcd61a7ec..b75e77f3aa 100644 --- a/boards/particle-boron/include/periph_conf.h +++ b/boards/particle-boron/include/periph_conf.h @@ -60,11 +60,6 @@ static const uart_conf_t uart_config[] = { #define UART_NUMOF ARRAY_SIZE(uart_config) /** @} */ -/** - * @brief Enable the internal DC/DC converter - */ -#define NRF5X_ENABLE_DCDC - #ifdef __cplusplus } #endif diff --git a/boards/particle-xenon/include/periph_conf.h b/boards/particle-xenon/include/periph_conf.h index f0ff0e8698..7472a02cfb 100644 --- a/boards/particle-xenon/include/periph_conf.h +++ b/boards/particle-xenon/include/periph_conf.h @@ -60,11 +60,6 @@ static const uart_conf_t uart_config[] = { #define UART_NUMOF ARRAY_SIZE(uart_config) /** @} */ -/** - * @brief Enable the internal DC/DC converter - */ -#define NRF5X_ENABLE_DCDC - #ifdef __cplusplus } #endif diff --git a/boards/pinetime/Makefile.features b/boards/pinetime/Makefile.features index 53a8d3d1a0..53578f9b44 100644 --- a/boards/pinetime/Makefile.features +++ b/boards/pinetime/Makefile.features @@ -4,5 +4,6 @@ CPU_MODEL = nrf52832xxaa FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_spi #FEATURES_PROVIDED += periph_uart +FEATURES_PROVIDED += vdd_lc_filter_reg1 include $(RIOTBOARD)/common/nrf52/Makefile.features diff --git a/boards/pinetime/include/periph_conf.h b/boards/pinetime/include/periph_conf.h index 1066d67a52..7455df2042 100644 --- a/boards/pinetime/include/periph_conf.h +++ b/boards/pinetime/include/periph_conf.h @@ -64,11 +64,6 @@ static const i2c_conf_t i2c_config[] = { #define I2C_NUMOF ARRAY_SIZE(i2c_config) /** @} */ -/** - * @brief Enable the internal DC/DC converter - */ -#define NRF5X_ENABLE_DCDC - #ifdef __cplusplus } #endif diff --git a/boards/reel/Makefile.features b/boards/reel/Makefile.features index e96ab8ee7c..2ed3d7f90c 100644 --- a/boards/reel/Makefile.features +++ b/boards/reel/Makefile.features @@ -5,6 +5,7 @@ FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_uart FEATURES_PROVIDED += periph_usbdev +FEATURES_PROVIDED += vdd_lc_filter_reg1 # Various other features (if any) diff --git a/boards/reel/include/periph_conf.h b/boards/reel/include/periph_conf.h index fbe1f41d6d..234ad239f3 100644 --- a/boards/reel/include/periph_conf.h +++ b/boards/reel/include/periph_conf.h @@ -68,11 +68,6 @@ static const spi_conf_t spi_config[] = { #define SPI_NUMOF ARRAY_SIZE(spi_config) /** @} */ -/** - * @brief Enable the internal DC/DC converter - */ -#define NRF5X_ENABLE_DCDC - #ifdef __cplusplus } #endif diff --git a/boards/ruuvitag/Makefile.features b/boards/ruuvitag/Makefile.features index fecb076954..8c1feef43f 100644 --- a/boards/ruuvitag/Makefile.features +++ b/boards/ruuvitag/Makefile.features @@ -3,5 +3,6 @@ CPU_MODEL = nrf52832xxaa # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_uart +FEATURES_PROVIDED += vdd_lc_filter_reg1 include $(RIOTBOARD)/common/nrf52/Makefile.features diff --git a/boards/ruuvitag/include/periph_conf.h b/boards/ruuvitag/include/periph_conf.h index a4bc2ac210..ee7390f9ff 100644 --- a/boards/ruuvitag/include/periph_conf.h +++ b/boards/ruuvitag/include/periph_conf.h @@ -55,11 +55,6 @@ static const spi_conf_t spi_config[] = { #define UART_PIN_TX GPIO_PIN(0, 5) /** @} */ -/** - * @brief Enable the internal DC/DC converter - */ -#define NRF5X_ENABLE_DCDC - #ifdef __cplusplus } #endif diff --git a/boards/thingy52/Makefile.features b/boards/thingy52/Makefile.features index f8e8dadfd9..3ac7472acb 100644 --- a/boards/thingy52/Makefile.features +++ b/boards/thingy52/Makefile.features @@ -3,5 +3,6 @@ CPU_MODEL = nrf52832xxaa # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_uart +FEATURES_PROVIDED += vdd_lc_filter_reg1 include $(RIOTBOARD)/common/nrf52/Makefile.features diff --git a/boards/thingy52/include/periph_conf.h b/boards/thingy52/include/periph_conf.h index 86237ce391..6e53f6f6c7 100644 --- a/boards/thingy52/include/periph_conf.h +++ b/boards/thingy52/include/periph_conf.h @@ -62,11 +62,6 @@ static const i2c_conf_t i2c_config[] = { #define I2C_NUMOF ARRAY_SIZE(i2c_config) /** @} */ -/** - * @brief Enable the internal DC/DC converter - */ -#define NRF5X_ENABLE_DCDC - #ifdef __cplusplus } #endif