Replace old define with new one. Removed semaphore release call in pr…

…e lcd spi transfer and as it should be released in post lcd spi transfer. Adjust usart settings when spi mux isn't used (project-chip#33123) Co-authored-by: SenthilKumar Edaikkalpadi Kannusamy <[email protected]>
stingchang · Apr 24, 2024 · 93a8ced · 93a8ced
1 parent a456135
commit 93a8ced
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/examples/platform/silabs/efr32/rs911x/hal/efx32_ncp_host.c b/examples/platform/silabs/efr32/rs911x/hal/efx32_ncp_host.c
@@ -111,6 +111,9 @@ static void efx32_spi_init(void)
     // Enable USART interface pins
     GPIO->USARTROUTE[SPI_USART_ROUTE_INDEX].ROUTEEN = GPIO_USART_ROUTEEN_RXPEN | // MISO
         GPIO_USART_ROUTEEN_TXPEN |                                               // MOSI
+#if !SL_SPICTRL_MUX
+        GPIO_USART_ROUTEEN_CSPEN |
+#endif
         GPIO_USART_ROUTEEN_CLKPEN;
 
     // Set slew rate for alternate usage pins

diff --git a/examples/platform/silabs/efr32/rs911x/hal/sl_si91x_ncp_utility.c b/examples/platform/silabs/efr32/rs911x/hal/sl_si91x_ncp_utility.c
@@ -88,9 +88,6 @@ sl_status_t sl_wfx_host_pre_lcd_spi_transfer(void)
     {
         SPIDRV_SetBaudrate(SL_SPIDRV_LCD_BITRATE);
     }
-#if SL_SPICTRL_MUX
-    xSemaphoreGive(spi_sem_sync_hdl);
-#endif // SL_SPICTRL_MUX
     return status;
 }
 
@@ -122,7 +119,6 @@ void SPIDRV_SetBaudrate(uint32_t baudrate)
         USART_InitSync(SPI_USART, &usartInit);
     }
 }
-
 /********************************************************
  * @fn   spi_board_init(void)
  * @brief

diff --git a/src/platform/silabs/rs911x/rsi_ble_config.h b/src/platform/silabs/rs911x/rsi_ble_config.h
@@ -273,7 +273,7 @@
     (SL_SI91X_TCP_IP_FEAT_DHCPV4_CLIENT) //! TCP/IP feature select bitmap for selecting TCP/IP features
 #define RSI_CUSTOM_FEATURE_BIT_MAP SL_SI91X_CUSTOM_FEAT_EXTENTION_VALID //! To set custom feature select bit map
 
-#ifdef CHIP_9117
+#ifdef SLI_SI917
 #if WIFI_ENABLE_SECURITY_WPA3_TRANSITION // Adding Support for WPA3 transition
 #define RSI_EXT_CUSTOM_FEATURE_BIT_MAP                                                                                             \
     (SL_SI91X_EXT_FEAT_LOW_POWER_MODE | SL_SI91X_EXT_FEAT_XTAL_CLK_ENABLE(1) | SL_SI91X_RAM_LEVEL_NWP_BASIC_MCU_ADV |              \
@@ -285,7 +285,7 @@
 #endif /* WIFI_ENABLE_SECURITY_WPA3_TRANSITION */
 #else  // EXP_BOARD
 #define RSI_EXT_CUSTOM_FEATURE_BIT_MAP (SL_SI91X_EXT_FEAT_LOW_POWER_MODE | SL_SI91X_EXT_FEAT_XTAL_CLK_ENABLE(2))
-#endif /* CHIP_9117 */
+#endif /* SLI_SI917 */
 
 #define RSI_EXT_TCPIP_FEATURE_BITMAP 0
 #define RSI_BT_FEATURE_BITMAP (SL_SI91X_BT_RF_TYPE | SL_SI91X_ENABLE_BLE_PROTOCOL)