[nrf toup] Add nRF7120 WiFi support

Use the generic CHIP_WIFI configuration and select
the appropriate nRF70 or nRF71 WiFi driver.

Signed-off-by: Dominik Michalczyk <dominik.michalczyk@nordicsemi.no>

Author: dominik-michalczyk-nordic

config/nrfconnect/chip-module/CMakeLists.txt

@@ -156,12 +156,12 @@ matter_add_gn_arg_bool  ("chip_progress_logging"                  CONFIG_MATTER_
 matter_add_gn_arg_bool  ("chip_detail_logging"                    CONFIG_MATTER_LOG_LEVEL GREATER_EQUAL 4)
 matter_add_gn_arg_bool  ("chip_automation_logging"                FALSE)
 matter_add_gn_arg_bool  ("chip_malloc_sys_heap"                   CONFIG_CHIP_MALLOC_SYS_HEAP)
-matter_add_gn_arg_bool  ("chip_enable_wifi"                       CONFIG_WIFI_NRF70)
+matter_add_gn_arg_bool  ("chip_enable_wifi"                       CONFIG_CHIP_WIFI)
 matter_add_gn_arg_bool  ("chip_system_config_provide_statistics"  CONFIG_CHIP_STATISTICS)
 matter_add_gn_arg_bool  ("chip_enable_icd_server"                 CONFIG_CHIP_ENABLE_ICD_SUPPORT)
 matter_add_gn_arg_bool  ("chip_enable_factory_data"               CONFIG_CHIP_FACTORY_DATA_NRFCONNECT_BACKEND)
 matter_add_gn_arg_bool  ("chip_enable_read_client"                CONFIG_CHIP_ENABLE_READ_CLIENT)
-matter_add_gn_arg_bool  ("chip_mdns_minimal"                      CONFIG_WIFI_NRF70)
+matter_add_gn_arg_bool  ("chip_mdns_minimal"                      CONFIG_CHIP_WIFI)
 matter_add_gn_arg_bool  ("chip_config_enable_groupcast"           CONFIG_CHIP_ENABLE_GROUPCAST)
 matter_add_gn_arg_bool  ("chip_mdns_platform"                     CONFIG_OPENTHREAD)
 matter_add_gn_arg_bool  ("enable_im_pretty_print"                 CONFIG_CHIP_IM_PRETTY_PRINT)
@@ -188,7 +188,7 @@ if (CONFIG_CHIP_ROTATING_DEVICE_ID)
     matter_add_gn_arg_bool("chip_enable_additional_data_advertising" TRUE)
 endif()
 
-if(CONFIG_WIFI_NRF70)
+if(CONFIG_CHIP_WIFI)
     matter_add_gn_arg_string("chip_mdns" "minimal")
 elseif (CONFIG_OPENTHREAD)
     matter_add_gn_arg_string("chip_mdns" "platform")

config/nrfconnect/chip-module/Kconfig

@@ -460,7 +460,8 @@ config CHIP_SYSTEM_PACKETBUFFER_POOL_SIZE
 
 # See config/common/cmake/Kconfig for full definition
 config CHIP_WIFI
-	select WIFI_NRF70
+	select WIFI_NRF70 if !DT_HAS_NORDIC_NRF7120_WIFI_ENABLED
+	select WIFI_NRF71 if DT_HAS_NORDIC_NRF7120_WIFI_ENABLED
 	select WIFI
 	select WIFI_NM_WPA_SUPPLICANT
 	select NETWORKING

examples/pump-app/nrfconnect/main/AppTask.cpp

@@ -167,7 +167,7 @@ CHIP_ERROR AppTask::Init()
     }
 
     sThreadNetworkDriver.Init();
-#elif !defined(CONFIG_WIFI_NRF70)
+#elif !defined(CONFIG_CHIP_WIFI)
     return CHIP_ERROR_INTERNAL;
 #endif
 

examples/pump-controller-app/nrfconnect/main/AppTask.cpp

@@ -153,7 +153,7 @@ CHIP_ERROR AppTask::Init()
     }
 
     sThreadNetworkDriver.Init();
-#elif !defined(CONFIG_WIFI_NRF70)
+#elif !defined(CONFIG_CHIP_WIFI)
     return CHIP_ERROR_INTERNAL;
 #endif
 

examples/window-app/nrfconnect/main/AppTask.cpp

@@ -171,7 +171,7 @@ CHIP_ERROR AppTask::Init()
     }
 
     sThreadNetworkDriver.Init();
-#elif !defined(CONFIG_WIFI_NRF70)
+#elif !defined(CONFIG_CHIP_WIFI)
     return CHIP_ERROR_INTERNAL;
 #endif
 

src/platform/nrfconnect/CHIPDevicePlatformConfig.h

@@ -64,8 +64,8 @@
 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD 0
 #endif
 
-#ifdef CONFIG_WIFI_NRF70
-#define CHIP_DEVICE_CONFIG_ENABLE_WIFI CONFIG_WIFI_NRF70
+#ifdef CONFIG_CHIP_WIFI
+#define CHIP_DEVICE_CONFIG_ENABLE_WIFI 1
 #define CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION 1
 #define CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP 0
 #else

src/platform/nrfconnect/DiagnosticDataProviderImplNrf.cpp

@@ -23,7 +23,7 @@
 
 #include "DiagnosticDataProviderImplNrf.h"
 
-#ifdef CONFIG_WIFI_NRF70
+#ifdef CONFIG_CHIP_WIFI
 #include <platform/nrfconnect/wifi/WiFiManager.h>
 #endif
 
@@ -41,7 +41,7 @@ DiagnosticDataProviderImplNrf & DiagnosticDataProviderImplNrf::GetDefaultInstanc
     return sInstance;
 }
 
-#ifdef CONFIG_WIFI_NRF70
+#ifdef CONFIG_CHIP_WIFI
 CHIP_ERROR DiagnosticDataProviderImplNrf::GetWiFiBssId(MutableByteSpan & value)
 {
     WiFiManager::WiFiInfo info;

src/platform/nrfconnect/DiagnosticDataProviderImplNrf.h

@@ -31,7 +31,7 @@ namespace DeviceLayer {
 class DiagnosticDataProviderImplNrf : public DiagnosticDataProviderImpl
 {
 public:
-#ifdef CONFIG_WIFI_NRF70
+#ifdef CONFIG_CHIP_WIFI
     CHIP_ERROR GetWiFiBssId(MutableByteSpan & value) override;
     CHIP_ERROR GetWiFiSecurityType(app::Clusters::WiFiNetworkDiagnostics::SecurityTypeEnum & securityType) override;
     CHIP_ERROR GetWiFiVersion(app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum & wiFiVersion) override;

src/platform/nrfconnect/SystemPlatformConfig.h

@@ -51,7 +51,7 @@ struct ChipDeviceEvent;
 #endif
 
 #ifndef CHIP_SYSTEM_CONFIG_PACKETBUFFER_CAPACITY_MAX
-#ifdef CONFIG_WIFI_NRF70
+#ifdef CONFIG_CHIP_WIFI
 // Minimal mDNS uses Matter packet buffers, so as long as minimal mDNS is used
 // in Nordic's Wi-Fi solution, the packet buffers must be a bit bigger than what
 // is required by Matter.
@@ -61,7 +61,7 @@ struct ChipDeviceEvent;
 // unless for large messages that can be sent over BTP or TCP. But those will
 // likely require a separate buffer pool or employ chained buffers.
 #define CHIP_SYSTEM_CONFIG_PACKETBUFFER_CAPACITY_MAX 1280
-#endif // CONFIG_WIFI_NRF70
+#endif // CONFIG_CHIP_WIFI
 #endif // CHIP_SYSTEM_CONFIG_PACKETBUFFER_CAPACITY_MAX
 
 // ========== Platform-specific Configuration Overrides =========