diff --git a/boards/nxp/mimxrt1060_evk/doc/index.rst b/boards/nxp/mimxrt1060_evk/doc/index.rst index d2a04b18421..5fcfcba164d 100644 --- a/boards/nxp/mimxrt1060_evk/doc/index.rst +++ b/boards/nxp/mimxrt1060_evk/doc/index.rst @@ -438,7 +438,7 @@ Shield for M.2 Wi-Fi and BT Interface Rev C version is tested with :ref:`nxp_m2_wifi_bt` shield to attach any M.2 module with BT HCI UART interface and Wi-Fi SDIO interface. The shield binds the required NXP HCI driver or SDIO driver to perform firmware-load and other setup configurations -for NXP SoC IW416/IW612. +for NXP SoC IW416/IW612/IW610. Troubleshooting =============== diff --git a/boards/shields/nxp_m2_wifi_bt/Kconfig.defconfig b/boards/shields/nxp_m2_wifi_bt/Kconfig.defconfig index 79692b8f2e2..0b93ae90e30 100644 --- a/boards/shields/nxp_m2_wifi_bt/Kconfig.defconfig +++ b/boards/shields/nxp_m2_wifi_bt/Kconfig.defconfig @@ -55,7 +55,34 @@ endif # WIFI endif # SHIELD_NXP_M2_2EL_WIFI_BT -if (BT_NXP_IW416) || (BT_NXP_NW612) || (NXP_IW416) || (NXP_IW61X) +if SHIELD_NXP_M2_2LL_WIFI_BT + +if BT + +choice BT_NXP_MODULE + default BT_NXP_IW610 +endchoice + +endif # BT + +if WIFI + +config WIFI_NXP + default y + +choice NXP_WIFI_PART + default NXP_IW610 +endchoice + +choice NXP_IW610_MODULE + default NXP_IW610_MURATA_2LL_M2 +endchoice + +endif # WIFI + +endif # SHIELD_NXP_M2_2LL_WIFI_BT + +if (BT_NXP_IW416) || (BT_NXP_NW612) || (BT_NXP_IW610) || (NXP_IW416) || (NXP_IW61X) || (NXP_IW610) if BT diff --git a/boards/shields/nxp_m2_wifi_bt/Kconfig.shield b/boards/shields/nxp_m2_wifi_bt/Kconfig.shield index d61c97955ef..cba3a53ed5e 100644 --- a/boards/shields/nxp_m2_wifi_bt/Kconfig.shield +++ b/boards/shields/nxp_m2_wifi_bt/Kconfig.shield @@ -6,3 +6,6 @@ config SHIELD_NXP_M2_1XK_WIFI_BT config SHIELD_NXP_M2_2EL_WIFI_BT def_bool $(shields_list_contains,nxp_m2_2el_wifi_bt) + +config SHIELD_NXP_M2_2LL_WIFI_BT + def_bool $(shields_list_contains,nxp_m2_2ll_wifi_bt) diff --git a/boards/shields/nxp_m2_wifi_bt/doc/index.rst b/boards/shields/nxp_m2_wifi_bt/doc/index.rst index ca1069db708..2cef6dc35db 100644 --- a/boards/shields/nxp_m2_wifi_bt/doc/index.rst +++ b/boards/shields/nxp_m2_wifi_bt/doc/index.rst @@ -10,22 +10,26 @@ This Zephyr shield is tested with the following M.2 modules and hardware for Wi- - Embedded Artist 1XK module - uses Murata 1XK radio module with NXP IW416 chipset - Embedded Artist 2EL module - uses Murata 2EL radio module with NXP IW612 chipset +- Embedded Artist 2LL module - uses Murata 2LL radio module with NXP IW610 chipset More information about supported chipsets, radio modules and M.2 modules can be found in below links, - `IW612 NXP Chipset `_ - `IW416 NXP Chipset `_ +- `IW610 NXP Chipset `_ - `2EL Murata Radio Module `_ - `1XK Murata Radio Module `_ +- `2LL Murata Radio Module `_ - `1XK Embedded Artist Module `_ - `2EL Embedded Artist Module `_ +- `2LL Embedded Artist Module `_ Requirements ************ To use the shield, below requirements needs to be satisfied. -- M.2 module with BT HCI UART and SDIO Interface with NXP IW416 or IW612 SoC support. +- M.2 module with BT HCI UART and SDIO Interface with NXP IW416 or IW612 or IW610 SoC support. - Host platform shall have compatible M.2 interface slot. - For Coex (Wi-Fi + BT), UART driver that supports UART RTS line control to wakeup BT CPU from sleep. - To use default Bluetooth-Shell app it needs ~490KB flash & ~130KB RAM memory. @@ -57,6 +61,7 @@ Below are the supported shields to be used with ``--shield