Skip to content

Add support for IW610 SoC #534

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+6,628 −915
Open

Add support for IW610 SoC #534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8313125
zephyr: src: rt: add support for firmware blobs for IW610 SoC
gangli02 May 12, 2025
c00e109
mcux: mcux-sdk-ng: add txpwr data for IW610
gangli02 May 12, 2025
3275f40
mcux: upgrade wifi_nxp to r51.z_up.p9 to support IW610
MaochenWang1 May 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...x-sdk-ng/components/wifi_bt_module/AzureWave/tx_pwr_limits/wlan_txpwrlimit_cfg_WW_rw610.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3297,7 +3297,7 @@ const static uint8_t rutxpowerlimit_cfg_set_WW[] = {
0x00, 0x00, 0x09, 0x0c, 0x0f, 0x11, 0x00, 0x00, 0x00, 0x08, 0x0b, 0x0e, 0x11, 0x00, 0x00, 0x00,
0x0e, 0x0e, 0x0e, 0x0e, 0x00, 0x64, 0x02, 0x03, 0x00, 0x88, 0x88, 0x00};

const static uint8_t rutxpowerlimit_cfg_set_FCC[] = {
const static uint8_t rutxpowerlimit_cfg_set_US[] = {
0x6d, 0x02, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x18, 0x01, 0x11, 0x12, 0x12, 0x12,
0x00, 0x00, 0x00, 0x11, 0x12, 0x12, 0x11, 0x00, 0x00, 0x00, 0x0f, 0x12, 0x11, 0x10, 0x00, 0x00,
0x00, 0x0d, 0x0f, 0x11, 0x11, 0x00, 0x00, 0x00, 0x0d, 0x0f, 0x11, 0x11, 0x00, 0x00, 0x00, 0x0d,
Expand Down
2 changes: 1 addition & 1 deletion mcux/mcux-sdk-ng/components/wifi_bt_module/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ if (CONFIG_MCUX_COMPONENT_component.wifi_bt_module.tx_pwr_limits)
Murata/tx_pwr_limits/wlan_txpwrlimit_cfg_murata_1ZM_WW.h
Murata/tx_pwr_limits/wlan_txpwrlimit_cfg_murata_2DS_WW.h
Murata/tx_pwr_limits/wlan_txpwrlimit_cfg_murata_2EL_WW.h
Murata/tx_pwr_limits/wlan_txpwrlimit_cfg_murata_NH_FCC.h
Murata/tx_pwr_limits/wlan_txpwrlimit_cfg_murata_2LL.h
u-blox/tx_pwr_limits/wlan_txpwrlimit_cfg_jody_w5_WW.h
)
mcux_add_include(
Expand Down
189 changes: 165 additions & 24 deletions ...imits/wlan_txpwrlimit_cfg_murata_NH_FCC.h → ...r_limits/wlan_txpwrlimit_cfg_murata_2LL.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/** @file wlan_txpwrlimit_cfg_murata_NH_FCC.h
/** @file wlan_txpwrlimit_cfg_murata_2LL.h
*
* @brief This file provides Murata NH WLAN FCC Mode Tx Power Limits.
* @brief This file provides Murata 2LL WLAN Mode Tx Power Limits.
*
* Copyright 2024 NXP
* Copyright 2024-2025 NXP
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
Expand Down Expand Up @@ -274,20 +274,125 @@ static wlan_chanlist_t chanlist_5g_cfg = {

#if CONFIG_COMPRESS_TX_PWTBL

static const t_u8 rg_table_fc[] = {
static const t_u8 rg_table_WW_qfn[] = {
0x01, 0x00, 0xee, 0x01, 0x06, 0x00, 0x57, 0x57,
0x00, 0x00, 0x00, 0x00, 0x06, 0x02, 0x7d, 0x00, 0x88, 0x88, 0x03, 0x01, 0x0b, 0x00, 0x00, 0x00,
0x00, 0x00, 0x57, 0x57, 0x00, 0x00, 0xb3, 0x06, 0x00, 0x02, 0x0c, 0x13, 0x02, 0xc0, 0x20, 0x80,
0x08, 0x0c, 0x02, 0x00, 0x00, 0x83, 0x01, 0x50, 0x28, 0x24, 0x1a, 0x11, 0x0a, 0x86, 0x41, 0x60,
0xf0, 0x90, 0x58, 0x1c, 0x02, 0x02, 0x89, 0x83, 0x22, 0xb1, 0x78, 0xcc, 0x6e, 0x30, 0x00, 0x15,
0xc6, 0xa2, 0xd1, 0xf2, 0x3c, 0x40, 0x03, 0x23, 0x83, 0xc8, 0x40, 0x80, 0xf0, 0x78, 0x30, 0x10,
0x8c, 0x07, 0x03, 0xe0, 0xe2, 0xa0, 0x50, 0x10, 0x0e, 0x04, 0x07, 0x04, 0xc0, 0x00, 0xe0, 0x70,
0x06, 0x6b, 0x37, 0x9c, 0xce, 0xe7, 0xb3, 0xf9, 0xc4, 0xea, 0x79, 0x3e, 0x9b, 0x51, 0x68, 0x54,
0x8a, 0x05, 0x1a, 0x87, 0x49, 0xa0, 0xd1, 0xc0, 0x07, 0xea, 0x25, 0x46, 0x7a, 0x00, 0x34, 0xd6,
0x2a, 0xb4, 0xe8, 0x39, 0xf8};

static const t_u8 rg_table_WW_csp[] = {
0x01, 0x00, 0xee, 0x01, 0x06, 0x00, 0x57, 0x57,
0x00, 0x00, 0x00, 0x00, 0x06, 0x02, 0x7c, 0x00, 0x88, 0x88, 0x03, 0x01, 0x0b, 0x00, 0x00, 0x00,
0x00, 0x00, 0x57, 0x57, 0x00, 0x00, 0xa3, 0x06, 0x00, 0x02, 0x0c, 0x13, 0x02, 0xc0, 0x20, 0x80,
0x08, 0x0c, 0x02, 0x00, 0x00, 0x83, 0x01, 0x50, 0x28, 0x24, 0x1a, 0x11, 0x0a, 0x86, 0x41, 0x60,
0xf0, 0x90, 0x58, 0x1e, 0x25, 0x0f, 0x8a, 0xc5, 0xe2, 0x91, 0x68, 0x70, 0xac, 0x18, 0x0b, 0x03,
0x45, 0xc8, 0xf1, 0x08, 0x18, 0x04, 0x05, 0x07, 0x8f, 0x01, 0x01, 0xe0, 0xf0, 0x60, 0x21, 0x18,
0x0e, 0x07, 0xc1, 0xc5, 0x40, 0xa0, 0x20, 0x1c, 0x08, 0x0e, 0x09, 0x80, 0x01, 0xc0, 0xe0, 0x0c,
0xd2, 0x6d, 0x38, 0x9d, 0x4f, 0x27, 0xd3, 0x79, 0xcc, 0xee, 0x7b, 0x35, 0xa2, 0x50, 0x68, 0xf3,
0xfa, 0x2d, 0x0a, 0x91, 0x40, 0xa3, 0x00, 0x0f, 0xd4, 0x3a, 0x84, 0xf0, 0x00, 0x69, 0xab, 0xd5,
0x29, 0xb0, 0x73, 0xf0};

static const t_u8 rg_table_US_qfn[] = {
0x01, 0x00, 0xee, 0x01, 0x06, 0x00, 0x55, 0x53,
0x20, 0x10, 0x00, 0x01, 0x06, 0x02, 0x9a, 0x00, 0x88, 0x88, 0x03, 0x01, 0x0b, 0x00, 0x00, 0x00,
0x00, 0x00, 0x55, 0x53, 0x20, 0x10, 0x83, 0x08, 0x01, 0x02, 0x0c, 0x05, 0xab, 0x00, 0x61, 0x40,
0x58, 0x02, 0x06, 0x01, 0x0a, 0x81, 0xc2, 0x80, 0x38, 0x34, 0x12, 0x0c, 0x13, 0x82, 0xc0, 0xc1,
0x21, 0x30, 0x14, 0x36, 0x27, 0x15, 0x01, 0x84, 0xa0, 0xa2, 0xd0, 0x8c, 0x14, 0x92, 0x10, 0x82,
0x8e, 0xc1, 0x80, 0x40, 0x78, 0x3c, 0x18, 0x08, 0x46, 0x03, 0x81, 0xe0, 0x10, 0x00, 0xa8, 0x29,
0x08, 0x03, 0x05, 0x00, 0x41, 0x50, 0x4c, 0xbc, 0x26, 0x01, 0x0a, 0x01, 0xc0, 0x00, 0xe0, 0xac,
0xe2, 0x60, 0x14, 0x06, 0x4d, 0xe7, 0x33, 0xb9, 0xb0, 0x22, 0x34, 0x13, 0x04, 0x4e, 0xc2, 0x53,
0xe0, 0xac, 0xc6, 0x67, 0x35, 0x00, 0xcd, 0xc2, 0xb0, 0x70, 0xa8, 0x0a, 0x5f, 0x3b, 0x9e, 0xcb,
0xe9, 0xb3, 0x29, 0xa4, 0xda, 0x71, 0x3a, 0x9e, 0x54, 0x68, 0xc1, 0x3a, 0x54, 0xb0, 0xfc, 0x11,
0x04, 0x04, 0x2c, 0x80, 0xe0, 0x84, 0xb0, 0xd2, 0x00, 0x34, 0x83, 0xc3, 0x73, 0xb9, 0x58, 0x00,
0xa9, 0x76};
static const t_u16 rg_table_fc_len = 170;
0x20, 0x10, 0x00, 0x01, 0x06, 0x02, 0x7a, 0x00, 0x88, 0x88, 0x03, 0x01, 0x0b, 0x00, 0x00, 0x00,
0x00, 0x00, 0x55, 0x53, 0x20, 0x10, 0x83, 0x06, 0x00, 0x02, 0x0c, 0x05, 0xab, 0x00, 0x61, 0x60,
0x58, 0x00, 0x06, 0x14, 0x00, 0x85, 0x40, 0x41, 0x60, 0x34, 0x20, 0x26, 0x01, 0x83, 0x05, 0x01,
0x50, 0xf8, 0x30, 0x4e, 0x0b, 0x07, 0x89, 0xc4, 0x23, 0x11, 0x40, 0x1c, 0x58, 0x00, 0x2d, 0x09,
0x41, 0x49, 0x21, 0x18, 0x28, 0xb4, 0x18, 0x04, 0x07, 0x83, 0xc1, 0x80, 0x84, 0x60, 0x38, 0x1f,
0x10, 0x15, 0x05, 0x03, 0x60, 0x00, 0x70, 0x50, 0x39, 0x34, 0x0a, 0x02, 0x64, 0x21, 0x30, 0x44,
0xd0, 0x24, 0x01, 0x99, 0x4e, 0x26, 0xf3, 0x50, 0x0c, 0xf0, 0x24, 0x13, 0x9f, 0x44, 0x0f, 0xc1,
0x20, 0x40, 0x46, 0x90, 0x0e, 0x08, 0xc4, 0x0d, 0x20, 0x03, 0x48, 0x44, 0x10, 0x10, 0xa7, 0x84,
0x29, 0x40};

static const t_u8 rg_table_US_csp[] = {
0x01, 0x00, 0xee, 0x01, 0x06, 0x00, 0x55, 0x53,
0x20, 0x10, 0x00, 0x01, 0x06, 0x02, 0x8b, 0x00, 0x88, 0x88, 0x03, 0x01, 0x0b, 0x00, 0x00, 0x00,
0x00, 0x00, 0x55, 0x53, 0x20, 0x10, 0x93, 0x07, 0x00, 0x02, 0x0c, 0x05, 0xab, 0x00, 0x61, 0x50,
0x58, 0x00, 0x06, 0x13, 0x81, 0x81, 0x42, 0x60, 0x20, 0x90, 0x06, 0x0d, 0x08, 0x0a, 0x42, 0xa1,
0x90, 0xe0, 0x18, 0x4a, 0x0b, 0x07, 0x01, 0xc4, 0x61, 0x70, 0xd8, 0x7c, 0x66, 0x25, 0x1c, 0x8a,
0xc1, 0x45, 0xa1, 0x18, 0x29, 0x24, 0x21, 0x22, 0x06, 0x01, 0x01, 0xe0, 0xf0, 0x60, 0x21, 0x18,
0x0e, 0x07, 0xc3, 0x85, 0x41, 0x40, 0x38, 0x4c, 0x02, 0x14, 0x09, 0x80, 0x01, 0xc1, 0x40, 0x44,
0xd8, 0x28, 0x01, 0x0a, 0x82, 0x42, 0x80, 0x99, 0xd0, 0x56, 0x6f, 0x35, 0x0a, 0x4e, 0xa1, 0x73,
0xca, 0x0c, 0xf8, 0x11, 0x45, 0x00, 0xd3, 0xa9, 0xb3, 0x7a, 0x78, 0x3a, 0x8c, 0x12, 0x9e, 0x82,
0xeb, 0x14, 0xa8, 0x71, 0xf8, 0x24, 0x1b, 0x9d, 0x47, 0x0d, 0x20, 0x03, 0x48, 0x46, 0xc0, 0x0e,
0x08, 0xd7, 0x40};

static const t_u8 rg_table_EU_qfn[] = {
0x01, 0x00, 0xee, 0x01, 0x06, 0x00, 0x45, 0x55,
0x20, 0x30, 0x00, 0x02, 0x06, 0x02, 0x74, 0x00, 0x88, 0x88, 0x03, 0x01, 0x0b, 0x00, 0x00, 0x00,
0x00, 0x00, 0x45, 0x55, 0x20, 0x30, 0x23, 0x06, 0x00, 0x02, 0x0c, 0x06, 0xab, 0x00, 0x21, 0x40,
0x68, 0x02, 0x07, 0x05, 0x83, 0xc1, 0x82, 0x70, 0x88, 0x24, 0x1a, 0x1a, 0x01, 0x85, 0x80, 0x05,
0x61, 0x28, 0x29, 0x1c, 0x23, 0x05, 0x15, 0x83, 0x00, 0x80, 0xf0, 0x78, 0x30, 0x10, 0x8c, 0x07,
0x03, 0xc0, 0x20, 0x01, 0x50, 0x50, 0x26, 0x0e, 0x04, 0x00, 0x01, 0xc1, 0x40, 0xa4, 0xa2, 0x54,
0x14, 0x04, 0x84, 0x81, 0x72, 0xe0, 0x70, 0x4a, 0x07, 0x27, 0x94, 0xca, 0xe5, 0xb3, 0x90, 0xa4,
0x40, 0x11, 0x32, 0x9a, 0x4d, 0x80, 0x07, 0xe0, 0x90, 0x20, 0x23, 0x33, 0x9c, 0x84, 0x64, 0x66,
0x90, 0x01, 0xa4, 0x22, 0x08, 0x08, 0x52, 0x25, 0x41, 0x09, 0x19, 0xf8};

static const t_u8 rg_table_EU_csp[] = {
0x01, 0x00, 0xee, 0x01, 0x06, 0x00, 0x45, 0x55,
0x20, 0x30, 0x00, 0x02, 0x06, 0x02, 0x6c, 0x00, 0x88, 0x88, 0x03, 0x01, 0x0b, 0x00, 0x00, 0x00,
0x00, 0x00, 0x45, 0x55, 0x20, 0x30, 0xa3, 0x05, 0x00, 0x02, 0x0c, 0x06, 0xab, 0x00, 0x21, 0x20,
0x68, 0x00, 0x02, 0x14, 0x82, 0xc1, 0xe1, 0x30, 0x48, 0x34, 0x22, 0x1b, 0x0b, 0x82, 0x8a, 0xc2,
0x30, 0x52, 0x38, 0x42, 0x22, 0x0c, 0x02, 0x03, 0xc1, 0xe0, 0xc0, 0x42, 0x30, 0x1c, 0x0f, 0x00,
0x80, 0x05, 0x41, 0x40, 0x20, 0x48, 0x1e, 0x0e, 0x04, 0x00, 0x01, 0xc1, 0x28, 0x3c, 0x96, 0x4f,
0x29, 0x95, 0xcb, 0x64, 0xd2, 0x89, 0x54, 0xb2, 0x49, 0x33, 0x98, 0x4d, 0xa5, 0xd3, 0x49, 0x58,
0x52, 0x79, 0x2c, 0x00, 0x1f, 0x82, 0x41, 0x39, 0xfc, 0x84, 0xd2, 0x00, 0x34, 0x84, 0x68, 0x93,
0x00, 0x8c, 0x84, 0xfc};

static const t_u8 rg_table_CN_qfn[] = {
0x01, 0x00, 0xee, 0x01, 0x06, 0x00, 0x43, 0x4e,
0x20, 0x50, 0x00, 0x02, 0x06, 0x02, 0xaa, 0x00, 0x88, 0x88, 0x03, 0x01, 0x0b, 0x00, 0x00, 0x00,
0x00, 0x00, 0x43, 0x4e, 0x20, 0x50, 0x83, 0x09, 0x00, 0x02, 0x0c, 0x06, 0xab, 0x00, 0x21, 0x40,
0x68, 0x00, 0x02, 0x11, 0x00, 0x84, 0xc1, 0x01, 0x00, 0x08, 0x2c, 0x02, 0x08, 0x00, 0x80, 0xc0,
0x30, 0x68, 0x44, 0x2a, 0x19, 0x0e, 0x88, 0x44, 0xa2, 0x90, 0x98, 0x5c, 0x36, 0x1f, 0x11, 0x89,
0xc1, 0xe3, 0x90, 0xc0, 0x60, 0x04, 0x0e, 0x01, 0x01, 0x48, 0x62, 0xb1, 0xd9, 0x2c, 0x9e, 0x53,
0x1b, 0x8b, 0x00, 0x65, 0xb2, 0x88, 0x98, 0xae, 0x10, 0x12, 0x96, 0x49, 0xa6, 0x80, 0x02, 0x38,
0x44, 0x12, 0x0e, 0x8f, 0x4b, 0xa6, 0xa0, 0xc0, 0x20, 0x3c, 0x1e, 0x0c, 0x04, 0x23, 0x01, 0xc0,
0xf8, 0x98, 0xa8, 0x28, 0x13, 0x09, 0xc0, 0xc0, 0x61, 0x2a, 0x90, 0x00, 0x1c, 0x14, 0xa7, 0xd4,
0xaa, 0x81, 0x40, 0x1d, 0x58, 0x28, 0x09, 0x09, 0x02, 0xc2, 0x60, 0x4a, 0xa0, 0x4e, 0xba, 0x0e,
0xad, 0xd4, 0x2b, 0x55, 0x5a, 0xbd, 0x66, 0xb9, 0x5b, 0xb3, 0x85, 0x23, 0x81, 0x20, 0x9d, 0x5a,
0xa8, 0x00, 0x3f, 0x4e, 0x02, 0x37, 0x50, 0x74, 0x20, 0x00, 0x69, 0xbf, 0x84, 0x61, 0x77, 0xc8,
0x65, 0xe0};

static const t_u8 rg_table_CN_csp[] = {
0x01, 0x00, 0xee, 0x01, 0x06, 0x00, 0x43, 0x4e,
0x20, 0x50, 0x00, 0x02, 0x06, 0x02, 0xa8, 0x00, 0x88, 0x88, 0x03, 0x01, 0x0b, 0x00, 0x00, 0x00,
0x00, 0x00, 0x43, 0x4e, 0x20, 0x50, 0x63, 0x09, 0x00, 0x02, 0x0c, 0x06, 0xab, 0x00, 0x21, 0x20,
0x60, 0x38, 0x02, 0x00, 0x00, 0x84, 0x41, 0x20, 0xf0, 0x08, 0x2c, 0x02, 0x08, 0x00, 0x80, 0xe0,
0xf0, 0x98, 0x5c, 0x36, 0x1f, 0x11, 0x89, 0xc2, 0xa1, 0x90, 0xe8, 0x84, 0x4a, 0x11, 0x1a, 0x00,
0x83, 0x00, 0x20, 0x78, 0xc4, 0x7e, 0x2b, 0x22, 0x92, 0x47, 0xa2, 0x90, 0xc9, 0x44, 0x94, 0x56,
0x10, 0x02, 0x84, 0x40, 0x92, 0xc0, 0x08, 0x1a, 0x4a, 0x47, 0x08, 0x02, 0x60, 0xd1, 0xc0, 0x08,
0x0a, 0x0e, 0x2b, 0x06, 0x4c, 0xc1, 0xe0, 0xc0, 0x42, 0x30, 0x1d, 0x0c, 0x00, 0x0a, 0x82, 0x81,
0x70, 0x98, 0x04, 0x28, 0x03, 0x00, 0x03, 0x82, 0x80, 0x90, 0xa8, 0x2c, 0x28, 0x04, 0xa6, 0xd3,
0xea, 0x21, 0x5a, 0x70, 0x20, 0x26, 0x13, 0xa8, 0xd6, 0x41, 0x15, 0x5a, 0xbd, 0x66, 0xa0, 0x0e,
0xae, 0x05, 0x2c, 0x75, 0x6a, 0xc5, 0x3a, 0xcf, 0x5c, 0x09, 0x57, 0x81, 0x77, 0x1b, 0x0c, 0x1c,
0xfc, 0x12, 0x0d, 0xd4, 0x42, 0x50, 0x73, 0x48, 0x00, 0xd2, 0x11, 0xbc, 0x83, 0x82, 0x37, 0x60};

static const t_u8 rg_table_JP_qfn[] = {
0x01, 0x00, 0xee, 0x01, 0x06, 0x00, 0x4a, 0x50,
0x20, 0x40, 0x00, 0x03, 0x06, 0x02, 0x62, 0x00, 0x88, 0x88, 0x03, 0x01, 0x0b, 0x00, 0x00, 0x00,
0x00, 0x00, 0x4a, 0x50, 0x20, 0x40, 0x03, 0x05, 0x00, 0x02, 0x0c, 0x14, 0x80, 0x00, 0x20, 0xc0,
0x6c, 0x0a, 0x09, 0x06, 0x82, 0xc0, 0xe1, 0x30, 0x71, 0x5c, 0x1c, 0x8f, 0x0c, 0x06, 0x01, 0x01,
0xe0, 0xf0, 0x60, 0x21, 0x18, 0x0e, 0x07, 0x80, 0x40, 0x02, 0xa0, 0x50, 0x10, 0x0e, 0x04, 0x07,
0x04, 0xc0, 0x00, 0xe0, 0x70, 0x06, 0x3b, 0x1f, 0x90, 0xc8, 0xe4, 0xb2, 0x79, 0x04, 0x8a, 0x49,
0x26, 0x8f, 0x4b, 0x65, 0x53, 0x09, 0x44, 0xba, 0x57, 0x31, 0x94, 0xcb, 0xc0, 0x07, 0xe9, 0x64,
0xe6, 0x4a, 0x00, 0x34, 0xd0, 0x27, 0xb3, 0x68, 0xd1, 0xf8};

static const t_u8 rg_table_JP_csp[] = {
0x01, 0x00, 0xee, 0x01, 0x06, 0x00, 0x4a, 0x50,
0x20, 0x40, 0x00, 0x03, 0x06, 0x02, 0x62, 0x00, 0x88, 0x88, 0x03, 0x01, 0x0b, 0x00, 0x00, 0x00,
0x00, 0x00, 0x4a, 0x50, 0x20, 0x40, 0x03, 0x05, 0x00, 0x02, 0x0c, 0x14, 0x80, 0x00, 0x20, 0xc0,
0x6c, 0x0a, 0x09, 0x06, 0x82, 0xc0, 0xe1, 0x30, 0x71, 0x5c, 0x1c, 0x8f, 0x0c, 0x06, 0x01, 0x01,
0xe0, 0xf0, 0x60, 0x21, 0x18, 0x0e, 0x07, 0x80, 0x40, 0x02, 0xa0, 0x50, 0x10, 0x0e, 0x04, 0x07,
0x04, 0xc0, 0x00, 0xe0, 0x70, 0x06, 0x3b, 0x1f, 0x90, 0xc8, 0xe4, 0xb2, 0x79, 0x04, 0x8a, 0x49,
0x26, 0x8f, 0x4b, 0x65, 0x53, 0x09, 0x44, 0xba, 0x57, 0x31, 0x94, 0xcb, 0xc0, 0x07, 0xe9, 0x64,
0xe6, 0x4a, 0x00, 0x34, 0xd0, 0x27, 0xb3, 0x68, 0xd1, 0xf8};
#else
#ifndef CONFIG_11AX
#ifndef CONFIG_11AC
Expand Down Expand Up @@ -2785,14 +2890,50 @@ static wifi_txpwrlimit_t tx_pwrlimit_5g_cfg = {

#if CONFIG_11AX
#if CONFIG_COMPRESS_RU_TX_PWTBL
const static uint8_t rutxpowerlimit_cfg_set[] = {
0x6d, 0x02, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x18, 0x01, 0x09, 0x09, 0x09, 0x09,
0x09, 0x00, 0x00, 0x09, 0x09, 0x09, 0x09, 0x09, 0x00, 0x00, 0x09, 0x09, 0x09, 0x09, 0x09, 0x00,
0x00, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x00, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x00, 0x09,
0x09, 0x09, 0x09, 0x09, 0x09, 0x00, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x00, 0x09, 0x09, 0x09,
0x09, 0x09, 0x09, 0x00, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x00, 0x09, 0x09, 0x09, 0x09, 0x09,
0x09, 0x00, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x00, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x00,
0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x64, 0x02, 0x03, 0x00, 0x88, 0x88, 0x00};
const static uint8_t rutxpowerlimit_cfg_set_WW[] = {
0x6d, 0x02, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x18, 0x01, 0x04, 0x06, 0x09, 0x0c,
0x00, 0x00, 0x00, 0x04, 0x06, 0x09, 0x08, 0x00, 0x00, 0x00, 0xfd, 0xfe, 0x02, 0x04, 0x00, 0x00,
0x00, 0x06, 0x08, 0x0a, 0x0a, 0x00, 0x00, 0x00, 0x03, 0x05, 0x07, 0x07, 0x00, 0x00, 0x00, 0x03,
0x05, 0x07, 0x07, 0x00, 0x00, 0x00, 0x06, 0x09, 0x0b, 0x0e, 0x00, 0x00, 0x00, 0x06, 0x09, 0x0b,
0x0e, 0x00, 0x00, 0x00, 0x06, 0x09, 0x09, 0x09, 0x00, 0x00, 0x00, 0x09, 0x0b, 0x0e, 0x0e, 0x00,
0x00, 0x00, 0x09, 0x0b, 0x0e, 0x0e, 0x00, 0x00, 0x00, 0x09, 0x0b, 0x0e, 0x0e, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x02, 0x03, 0x00, 0x88, 0x88, 0x00};

const static uint8_t rutxpowerlimit_cfg_set_US[] = {
0x6d, 0x02, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x18, 0x01, 0x0f, 0x12, 0x12, 0x12,
0x00, 0x00, 0x00, 0x12, 0x12, 0x12, 0x12, 0x00, 0x00, 0x00, 0x10, 0x12, 0x11, 0x11, 0x00, 0x00,
0x00, 0x0d, 0x10, 0x11, 0x11, 0x00, 0x00, 0x00, 0x0d, 0x10, 0x11, 0x11, 0x00, 0x00, 0x00, 0x0d,
0x10, 0x11, 0x11, 0x00, 0x00, 0x00, 0x0d, 0x10, 0x11, 0x11, 0x00, 0x00, 0x00, 0x0d, 0x10, 0x11,
0x11, 0x00, 0x00, 0x00, 0x09, 0x09, 0x09, 0x09, 0x00, 0x00, 0x00, 0x11, 0x11, 0x11, 0x11, 0x00,
0x00, 0x00, 0x11, 0x11, 0x11, 0x11, 0x00, 0x00, 0x00, 0x09, 0x0c, 0x0f, 0x11, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x02, 0x03, 0x00, 0x88, 0x88, 0x00};

const static uint8_t rutxpowerlimit_cfg_set_EU[] = {
0x6d, 0x02, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x18, 0x01, 0x0a, 0x0d, 0x10, 0x12,
0x00, 0x00, 0x00, 0x0a, 0x0d, 0x10, 0x12, 0x00, 0x00, 0x00, 0x0a, 0x0d, 0x10, 0x11, 0x00, 0x00,
0x00, 0x0e, 0x10, 0x11, 0x11, 0x00, 0x00, 0x00, 0x0a, 0x0c, 0x10, 0x11, 0x00, 0x00, 0x00, 0x0a,
0x0c, 0x10, 0x11, 0x00, 0x00, 0x00, 0x0a, 0x0c, 0x10, 0x11, 0x00, 0x00, 0x00, 0x0a, 0x0c, 0x10,
0x11, 0x00, 0x00, 0x00, 0x0a, 0x0c, 0x10, 0x11, 0x00, 0x00, 0x00, 0x0a, 0x0c, 0x0e, 0x0e, 0x00,
0x00, 0x00, 0x0a, 0x0c, 0x0e, 0x0e, 0x00, 0x00, 0x00, 0x0a, 0x0c, 0x0e, 0x0e, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x02, 0x03, 0x00, 0x88, 0x88, 0x00};

const static uint8_t rutxpowerlimit_cfg_set_CN[] = {
0x6d, 0x02, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x18, 0x01, 0x05, 0x08, 0x0b, 0x0e,
0x00, 0x00, 0x00, 0x05, 0x08, 0x0b, 0x08, 0x00, 0x00, 0x00, 0xfd, 0xfe, 0x02, 0x04, 0x00, 0x00,
0x00, 0x06, 0x09, 0x0b, 0x0f, 0x00, 0x00, 0x00, 0x06, 0x09, 0x0b, 0x0f, 0x00, 0x00, 0x00, 0x06,
0x09, 0x0b, 0x0f, 0x00, 0x00, 0x00, 0x06, 0x09, 0x0b, 0x0f, 0x00, 0x00, 0x00, 0x06, 0x09, 0x0b,
0x0f, 0x00, 0x00, 0x00, 0x06, 0x09, 0x0b, 0x0f, 0x00, 0x00, 0x00, 0x0e, 0x11, 0x11, 0x11, 0x00,
0x00, 0x00, 0x0e, 0x11, 0x11, 0x11, 0x00, 0x00, 0x00, 0x0e, 0x11, 0x11, 0x11, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x02, 0x03, 0x00, 0x88, 0x88, 0x00};

const static uint8_t rutxpowerlimit_cfg_set_JP[] = {
0x6d, 0x02, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x18, 0x01, 0x04, 0x06, 0x09, 0x0c,
0x00, 0x00, 0x00, 0x04, 0x06, 0x09, 0x0c, 0x00, 0x00, 0x00, 0x04, 0x06, 0x09, 0x0c, 0x00, 0x00,
0x00, 0x06, 0x08, 0x0a, 0x0a, 0x00, 0x00, 0x00, 0x03, 0x05, 0x07, 0x07, 0x00, 0x00, 0x00, 0x03,
0x05, 0x07, 0x07, 0x00, 0x00, 0x00, 0x09, 0x0b, 0x0e, 0x0e, 0x00, 0x00, 0x00, 0x09, 0x0b, 0x0e,
0x0e, 0x00, 0x00, 0x00, 0x09, 0x0b, 0x0e, 0x0e, 0x00, 0x00, 0x00, 0x09, 0x0b, 0x0e, 0x0e, 0x00,
0x00, 0x00, 0x09, 0x0b, 0x0e, 0x0e, 0x00, 0x00, 0x00, 0x09, 0x0b, 0x0e, 0x0e, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x02, 0x03, 0x00, 0x88, 0x88, 0x00};
#else
#define MAX_2G_RU_PWR_CHANNELS 26
#define MAX_5G_RU_PWR_CHANNELS 69
Expand Down
12 changes: 6 additions & 6 deletions mcux/mcux-sdk-ng/components/wifi_bt_module/incl/wifi_bt_module_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2021-2024 NXP
* Copyright 2021-2025 NXP
*
* SPDX-License-Identifier: BSD-3-Clause
*/
Expand Down Expand Up @@ -356,19 +356,19 @@

/* USD IW610 module */
#elif defined(WIFI_IW610_BOARD_RD_USD)
#define WIFI_BT_TX_PWR_LIMITS "wlan_txpwrlimit_cfg_murata_NH_FCC.h"
#define WIFI_BT_TX_PWR_LIMITS "wlan_txpwrlimit_cfg_murata_2LL.h"
#define IW610
#define SDMMCHOST_OPERATION_VOLTAGE_3V3
#define SDMMCHOST_OPERATION_VOLTAGE_1V8
#define SD_TIMING_MAX kSD_TimingDDR50Mode
#define WIFI_BT_USE_USD_INTERFACE
#define WLAN_ED_MAC_CTRL \
{ \
.ed_ctrl_2g = 0x1, .ed_offset_2g = 0xA, .ed_ctrl_5g = 0x1, .ed_offset_5g = 0xA \
}

/* RD IW610 module with M2 interface */
#elif defined(WIFI_IW610_BOARD_RD_M2)
#define WIFI_BT_TX_PWR_LIMITS "wlan_txpwrlimit_cfg_murata_NH_FCC.h"
/* 2LL NightHawk module with M2 interface */
#elif defined(WIFI_IW610_BOARD_MURATA_2LL_M2)
#define WIFI_BT_TX_PWR_LIMITS "wlan_txpwrlimit_cfg_murata_2LL.h"
#define IW610
#define SDMMCHOST_OPERATION_VOLTAGE_1V8
#define SD_TIMING_MAX kSD_TimingDDR50Mode
Expand Down
27 changes: 23 additions & 4 deletions mcux/middleware/wifi_nxp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# SPDX-License-Identifier: Apache-2.0
# Copyright 2022-2024 NXP

# define part number for this driver

# Legacy MCUX SDK code is in mcux/mcux-sdk.
# MCUX SDK NG code is in mcux/mcux-sdk-ng.
# Use the right code by checking whether the platform is not supported by MCUX SDK NG.
Expand All @@ -10,8 +12,6 @@ else()
set(MCUX_SDK_DIR ${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk-ng)
endif()

# define part number for this driver

zephyr_compile_definitions_ifdef(CONFIG_NXP_88W8987
SD8987
)
Expand All @@ -28,6 +28,10 @@ zephyr_compile_definitions_ifdef(CONFIG_NXP_88W8801
SD8801
)

zephyr_compile_definitions_ifdef(CONFIG_NXP_IW610
IW610
)

zephyr_compile_definitions_ifdef(CONFIG_NXP_RW610
RW610
WIFI_BT_TX_PWR_LIMITS="wlan_txpwrlimit_cfg_WW_rw610.h"
Expand Down Expand Up @@ -181,6 +185,20 @@ zephyr_compile_definitions_ifdef(CONFIG_NXP_88W8801_MURATA_2DS_M2
CONFIG_NXP_WIFI_ED_OFFSET_2G=0x0E
)

zephyr_compile_definitions_ifdef(CONFIG_NXP_IW610_MURATA_2LL_M2
WIFI_BT_TX_PWR_LIMITS="wlan_txpwrlimit_cfg_murata_2LL.h"
CONFIG_NXP_WIFI_ED_OFFSET_2G=0x0A
CONFIG_NXP_WIFI_ED_OFFSET_5G=0x0A
WIFI_BT_USE_M2_INTERFACE
)

zephyr_compile_definitions_ifdef(CONFIG_NXP_IW610_RD_USD
WIFI_BT_TX_PWR_LIMITS="wlan_txpwrlimit_cfg_murata_2LL.h"
CONFIG_NXP_WIFI_ED_OFFSET_2G=0x0A
CONFIG_NXP_WIFI_ED_OFFSET_5G=0x0A
WIFI_BT_USE_USD_INTERFACE
)

zephyr_compile_definitions_ifdef(CONFIG_NXP_WIFI_BT_USE_USD_INTERFACE
WIFI_BT_USE_USD_INTERFACE
)
Expand All @@ -195,7 +213,7 @@ zephyr_library_compile_definitions(
CONFIG_OSA_DEBUG_ASSERT_ENABLED=1
)

# mcux-sdk and mcux-sdk-ng shar the wifi_nxp, the lists and osa is
# mcux-sdk and mcux-sdk-ng share the wifi_nxp, the lists and osa is
# included in another way. Need add condition here.
if(DEFINED CONFIG_SOC_SDKNG_UNSUPPORTED)
zephyr_library_sources(${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk/utilities/misc_utilities/fsl_memcpy.S)
Expand Down Expand Up @@ -225,6 +243,7 @@ zephyr_include_directories(
wifi_bt_firmware/IW416
wifi_bt_firmware/nw61x
wifi_bt_firmware/8801
wifi_bt_firmware/iw610
cli
${MCUX_SDK_DIR}/components/osa/
${MCUX_SDK_DIR}/components/lists/
Expand Down Expand Up @@ -328,7 +347,7 @@ zephyr_code_relocate(FILES
wifidriver/wifi-imu.c
${MCUX_SDK_DIR}/drivers/imu/fsl_imu.c
${MCUX_SDK_DIR}/components/imu_adapter/fsl_adapter_imu.c
LOCATION RAM_TEXT)
LOCATION ${QUICK_ACCESS_CODE_AREA})
endif()

zephyr_code_relocate(FILES
Expand Down
Loading