From 4c9fd9ea881f5e423de771eaf14f890c252877db Mon Sep 17 00:00:00 2001 From: Carles Cufi Date: Wed, 20 Nov 2024 12:06:58 +0100 Subject: [PATCH] lib: dk_buttons_and_lets: Remove DK_LIBRARY_BUTTON_NO_ISR The nRF54L15PDK is no longer supported. Signed-off-by: Carles Cufi --- lib/dk_buttons_and_leds/Kconfig | 24 ---------- lib/dk_buttons_and_leds/dk_buttons_and_leds.c | 47 +++++++++---------- 2 files changed, 21 insertions(+), 50 deletions(-) diff --git a/lib/dk_buttons_and_leds/Kconfig b/lib/dk_buttons_and_leds/Kconfig index dc876fb9e908..2d15dd394f48 100644 --- a/lib/dk_buttons_and_leds/Kconfig +++ b/lib/dk_buttons_and_leds/Kconfig @@ -12,36 +12,12 @@ if DK_LIBRARY config DK_LIBRARY_BUTTON_SCAN_INTERVAL int "Scanning interval of buttons in milliseconds" - default 50 if DK_LIBRARY_BUTTON_NO_ISR default 10 config DK_LIBRARY_DYNAMIC_BUTTON_HANDLERS bool "Enable the runtime assignable button handler API" default y -config DK_LIBRARY_BUTTON_NO_ISR - bool "Poll buttons unconditionally (no interrupts) [EXPERIMENTAL]" - # Workaround for buttons on nRF54L15 PDK in revision 0.2.x. - default y if BOARD_NRF54L15PDK_NRF54L15_CPUAPP && (BOARD_REVISION = "0.2.0" || BOARD_REVISION = "0.2.1") - select EXPERIMENTAL - help - With this option disabled, the module periodically scans all the - available buttons until no button is pressed. If no button is - pressed, the module uses GPIO interrupts to detect the first button - press. On the first button press, the module switches back to - periodically scanning buttons. - - Enable this option to avoid relying on GPIO interrupts at all and - to unconditionally scan all buttons periodically. Please note that - the constant scanning activity increases the overall power - consumption of the system. - - For example, in case the application uses Button 3 or 4, the option - must be set for the nRF54L15 PDK (PCA10156) revisions - v0.2.0 AA0-ES2, v0.2.0 AA0-ES3, and v0.2.1 AB0-ES5. - These versions of the PDK have Buttons 3 and 4 connected to - the GPIO port which does not support interrupts. - module = DK_LIBRARY module-str = DK library source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" diff --git a/lib/dk_buttons_and_leds/dk_buttons_and_leds.c b/lib/dk_buttons_and_leds/dk_buttons_and_leds.c index ba733e04af89..f903ffa17df7 100644 --- a/lib/dk_buttons_and_leds/dk_buttons_and_leds.c +++ b/lib/dk_buttons_and_leds/dk_buttons_and_leds.c @@ -129,9 +129,7 @@ static void buttons_scan_fn(struct k_work *work) static bool initial_run = true; uint32_t button_scan; - __ASSERT_NO_MSG(!IS_ENABLED(CONFIG_DK_LIBRARY_BUTTON_NO_ISR) || !irq_enabled); - - if (!IS_ENABLED(CONFIG_DK_LIBRARY_BUTTON_NO_ISR) && irq_enabled) { + if (irq_enabled) { /* Disable GPIO interrupts for edge triggered devices. * Devices that are configured with active high interrupts are already disabled. */ @@ -159,7 +157,7 @@ static void buttons_scan_fn(struct k_work *work) last_button_scan = button_scan; - if (IS_ENABLED(CONFIG_DK_LIBRARY_BUTTON_NO_ISR) || (button_scan != 0)) { + if (button_scan != 0) { k_work_reschedule(&buttons_scan, K_MSEC(CONFIG_DK_LIBRARY_BUTTON_SCAN_INTERVAL)); } else { @@ -238,6 +236,7 @@ static void button_pressed(const struct device *gpio_dev, struct gpio_callback * int dk_buttons_init(button_handler_t button_handler) { + uint32_t pin_mask = 0; int err; button_handler_cb = button_handler; @@ -259,31 +258,27 @@ int dk_buttons_init(button_handler_t button_handler) } } - if (!IS_ENABLED(CONFIG_DK_LIBRARY_BUTTON_NO_ISR)) { - uint32_t pin_mask = 0; - - for (size_t i = 0; i < ARRAY_SIZE(buttons); i++) { - /* Module starts in scanning mode and will switch to - * callback mode if no button is pressed. - */ - err = gpio_pin_interrupt_configure_dt(&buttons[i], - GPIO_INT_DISABLE); - if (err) { - LOG_ERR("Cannot disable callbacks()"); - return err; - } - - pin_mask |= BIT(buttons[i].pin); + for (size_t i = 0; i < ARRAY_SIZE(buttons); i++) { + /* Module starts in scanning mode and will switch to + * callback mode if no button is pressed. + */ + err = gpio_pin_interrupt_configure_dt(&buttons[i], + GPIO_INT_DISABLE); + if (err) { + LOG_ERR("Cannot disable callbacks()"); + return err; } - gpio_init_callback(&gpio_cb, button_pressed, pin_mask); + pin_mask |= BIT(buttons[i].pin); + } - for (size_t i = 0; i < ARRAY_SIZE(buttons); i++) { - err = gpio_add_callback(buttons[i].port, &gpio_cb); - if (err) { - LOG_ERR("Cannot add callback"); - return err; - } + gpio_init_callback(&gpio_cb, button_pressed, pin_mask); + + for (size_t i = 0; i < ARRAY_SIZE(buttons); i++) { + err = gpio_add_callback(buttons[i].port, &gpio_cb); + if (err) { + LOG_ERR("Cannot add callback"); + return err; } }