From dd545c824ec0fde5db78e879e4de932c95097519 Mon Sep 17 00:00:00 2001 From: Ross Tyler Date: Sat, 30 Aug 2025 14:48:18 -0700 Subject: [PATCH] simplify ethernet spi interface override logic --- .../components/ethernet/ethernet_component.cpp | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/esphome/components/ethernet/ethernet_component.cpp b/esphome/components/ethernet/ethernet_component.cpp index 818aec9d7e..f2a91bfdf9 100644 --- a/esphome/components/ethernet/ethernet_component.cpp +++ b/esphome/components/ethernet/ethernet_component.cpp @@ -87,19 +87,15 @@ void EthernetComponent::setup() { .intr_flags = 0, }; - spi_host_device_t host; +#if defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3) || \ + defined(USE_ESP32_VARIANT_ESP32C6) + auto host = SPI2_HOST; +#else + auto host = SPI3_HOST; +#endif #ifdef USE_ESP_IDF if (this->interface_ != SPI_HOST_MAX) { host = this->interface_; - } else { -#endif -#if defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3) || \ - defined(USE_ESP32_VARIANT_ESP32C6) - host = SPI2_HOST; -#else - host = SPI3_HOST; -#endif -#if USE_ESP_IDF } #endif