Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions drivers/atwinc15x0/Makefile.dep
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,3 @@ USEPKG += driver_atwinc15x0
FEATURES_REQUIRED += periph_gpio
FEATURES_REQUIRED += periph_gpio_irq
FEATURES_REQUIRED += periph_spi

# esp8266 and esp32 vendor code and atwinc15x0 both define conflicting
# spi_flash_{read, write} functions.
# esp8266 and esp32 already have build-in WiFi, so it's unlikely to ever
# use this driver - just blacklist the architecture.
FEATURES_BLACKLIST += arch_esp8266
FEATURES_BLACKLIST += arch_esp32
3 changes: 1 addition & 2 deletions drivers/atwinc15x0/atwinc15x0_bus.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@ sint8 nm_bus_init(void *arg)
assert(atwinc15x0);
assert(gpio_is_valid(atwinc15x0->params.ssn_pin));

gpio_init(atwinc15x0->params.ssn_pin, GPIO_OUT);
gpio_set(atwinc15x0->params.ssn_pin);
spi_init_cs(atwinc15x0->params.spi, atwinc15x0->params.ssn_pin);

nm_bsp_reset();
nm_bsp_sleep(1);
Expand Down
1 change: 0 additions & 1 deletion pkg/driver_atwinc15x0/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,3 @@ CFLAGS += -Wno-pedantic
all:
$(QQ)"$(MAKE)" -C $(PKG_SOURCE_DIR)/src/driver/source -f $(RIOTBASE)/Makefile.base MODULE=driver_atwinc15x0
$(QQ)"$(MAKE)" -C $(PKG_SOURCE_DIR)/src/common/source -f $(RIOTBASE)/Makefile.base MODULE=driver_atwinc15x0_common
$(QQ)"$(MAKE)" -C $(PKG_SOURCE_DIR)/src/spi_flash/source -f $(RIOTBASE)/Makefile.base MODULE=driver_atwinc15x0_spi_flash
1 change: 0 additions & 1 deletion pkg/driver_atwinc15x0/Makefile.dep
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@ FEATURES_REQUIRED += periph_spi

USEMODULE += driver_atwinc15x0
USEMODULE += driver_atwinc15x0_common
USEMODULE += driver_atwinc15x0_spi_flash
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
From 0abb3daceea8424cc277a2c0c01570099c495c96 Mon Sep 17 00:00:00 2001
From: Gunar Schorcht <[email protected]>
Date: Tue, 13 May 2025 18:47:45 +0200
Subject: [PATCH 12/12] nmdrv: don't call spi_enable_flash(0)

SPI Flash isn't used in RIOT. Disabling the SPI Flash with `spi_enable_flash(0)` is the only function call to the SPI Flash driver. Therefore we don't use the SPI Flash driver at all and comment out this call to prevent an undefined reference.
---
src/driver/source/nmdrv.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/driver/source/nmdrv.c b/src/driver/source/nmdrv.c
index 396ade953a2..160d84b011b 100644
--- a/src/driver/source/nmdrv.c
+++ b/src/driver/source/nmdrv.c
@@ -383,14 +383,14 @@ sint8 nm_drv_deinit(void * arg)
M2M_ERR("[nmi stop]: chip_deinit fail\n");
goto ERR1;
}
-
+#if 0 /* We don't use SPI Flash in RIOT */
/* Disable SPI flash to save power when the chip is off */
- ret = spi_flash_enable(0);
+ ret = spi_flash_enable(0);
if (M2M_SUCCESS != ret) {
M2M_ERR("[nmi stop]: SPI flash disable fail\n");
goto ERR1;
}
-
+#endif
ret = nm_bus_iface_deinit();
if (M2M_SUCCESS != ret) {
M2M_ERR("[nmi stop]: fail init bus\n");
--
2.34.1

Loading