From 10186065be11e628957eb6eaa78bfbd93affe547 Mon Sep 17 00:00:00 2001
From: srningap <107042150+srningap@users.noreply.github.com>
Date: Thu, 24 Aug 2023 22:52:39 +0530
Subject: [PATCH] [Silabs] Using Wiseconnect for 917NCP (#28834)

* using wiseconnect for 917NCP

* Adds fix for 917NCP and rs9116 power cycle issue

* Updates matter_support
---
 examples/platform/silabs/efr32/BUILD.gn        | 5 +----
 examples/platform/silabs/efr32/rs911x/rsi_if.c | 8 --------
 third_party/silabs/efr32_sdk.gni               | 4 +---
 third_party/silabs/matter_support              | 2 +-
 4 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/examples/platform/silabs/efr32/BUILD.gn b/examples/platform/silabs/efr32/BUILD.gn
index 4ae40522fe4ccc..f850c156c53916 100644
--- a/examples/platform/silabs/efr32/BUILD.gn
+++ b/examples/platform/silabs/efr32/BUILD.gn
@@ -62,13 +62,10 @@ if (chip_enable_wifi) {
   assert(use_rs9116 || use_wf200 || use_SiWx917)
   import("${chip_root}/src/platform/silabs/wifi_args.gni")
 
-  if (use_rs9116) {
+  if (use_rs9116 || use_SiWx917) {
     wiseconnect_sdk_root =
         "${chip_root}/third_party/silabs/wiseconnect-wifi-bt-sdk"
     import("rs911x/rs911x.gni")
-  } else if (use_SiWx917) {
-    wisemcu_sdk_root = "${chip_root}/third_party/silabs/wisemcu-wifi-bt-sdk"
-    import("rs911x/rs9117.gni")
   }
   if (use_wf200) {
     import("wf200/wf200.gni")
diff --git a/examples/platform/silabs/efr32/rs911x/rsi_if.c b/examples/platform/silabs/efr32/rs911x/rsi_if.c
index a2e0f563727fbe..c89f31142beb96 100644
--- a/examples/platform/silabs/efr32/rs911x/rsi_if.c
+++ b/examples/platform/silabs/efr32/rs911x/rsi_if.c
@@ -628,14 +628,6 @@ void wfx_rsi_task(void * arg)
                     hasNotifiedIPV4 = false;
                 }
 #endif /* CHIP_DEVICE_CONFIG_ENABLE_IPV4 */
-                /*
-                 * Checks if the IPv6 event has been notified, if not invoke the nd6_tmr,
-                 * which starts the duplicate address detectation.
-                 */
-                if (!hasNotifiedIPV6)
-                {
-                    nd6_tmr();
-                }
                 /*
                  * Checks if the assigned IPv6 address is preferred by evaluating
                  * the first block of IPv6 address ( block 0)
diff --git a/third_party/silabs/efr32_sdk.gni b/third_party/silabs/efr32_sdk.gni
index 3e56227a15b7d4..50ec1eaf051668 100644
--- a/third_party/silabs/efr32_sdk.gni
+++ b/third_party/silabs/efr32_sdk.gni
@@ -21,10 +21,8 @@ import("${chip_root}/src/app/icd/icd.gni")
 import("${chip_root}/src/lib/lib.gni")
 import("silabs_board.gni")
 
-if (use_rs9116) {
+if (use_rs9116 || use_SiWx917) {
   wifi_sapi_root = "${chip_root}/third_party/silabs/wiseconnect-wifi-bt-sdk"
-} else {
-  wifi_sapi_root = "${chip_root}/third_party/silabs/wisemcu-wifi-bt-sdk"
 }
 
 declare_args() {
diff --git a/third_party/silabs/matter_support b/third_party/silabs/matter_support
index fb8fbd5919bd65..a7f35beb8e8601 160000
--- a/third_party/silabs/matter_support
+++ b/third_party/silabs/matter_support
@@ -1 +1 @@
-Subproject commit fb8fbd5919bd6528a90346ae1e7c8f8dfb5119e7
+Subproject commit a7f35beb8e8601b1686e4aa90f90060571bb9dc2