From e1a7cb458ec0ead8d9d7a1340fd486c6daad130b Mon Sep 17 00:00:00 2001 From: Bhavani Manda Date: Tue, 16 Apr 2024 18:50:57 +0000 Subject: [PATCH] Pull request #1762: ncp_commissioning_fix_if_lcd_disabled Merge in WMN_TOOLS/matter from ncp_fixes_if_lcd_disabled to RC_2.3.0-1.3 Squashed commit of the following: commit 7a93b89c6ce5d8b0fa248455321f5ae2d17516f3 Author: bhmanda Date: Tue Apr 16 17:08:26 2024 +0530 build error resolved commit eb302ffa7e0a002dfaf18f256302b3ca243dac42 Author: bhmanda Date: Tue Apr 16 16:54:01 2024 +0530 Removed semaphore release call in pre lcd spi transfer and as it should be released in post lcd spi transfer commit 4f9ec7914a0d4fe1de1d85e68bf8245e1eeb9910 Author: bhmanda Date: Tue Apr 16 16:37:31 2024 +0530 Added fixes for 917NCP if LCD disabled --- examples/platform/silabs/efr32/rs911x/hal/efx32_ncp_host.c | 7 +++++-- .../silabs/efr32/rs911x/hal/sl_si91x_ncp_utility.c | 5 +---- 2 files changed, 6 insertions(+), 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 index b48d72cdc00aee..09634f1fc35d19 100644 --- a/examples/platform/silabs/efr32/rs911x/hal/efx32_ncp_host.c +++ b/examples/platform/silabs/efr32/rs911x/hal/efx32_ncp_host.c @@ -110,8 +110,11 @@ 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 - GPIO_USART_ROUTEEN_CLKPEN; + 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 GPIO_SlewrateSet(SPI_CLOCK_PIN.port, 7, 7); 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 index 14e47f43f99f5d..b6ab0b6b81f091 100644 --- a/examples/platform/silabs/efr32/rs911x/hal/sl_si91x_ncp_utility.c +++ b/examples/platform/silabs/efr32/rs911x/hal/sl_si91x_ncp_utility.c @@ -87,10 +87,7 @@ sl_status_t sl_wfx_host_pre_lcd_spi_transfer(void) if (SL_STATUS_OK == status) { SPIDRV_SetBaudrate(SL_SPIDRV_LCD_BITRATE); - } -#if SL_SPICTRL_MUX - xSemaphoreGive(spi_sem_sync_hdl); -#endif // SL_SPICTRL_MUX + } return status; }