From cb598a321a6c1a936e1e6542469162e12f9c88cb Mon Sep 17 00:00:00 2001
From: Abhinav Kulkarni <abhinav.kulkarni@nxp.com>
Date: Wed, 18 Jun 2025 13:01:17 +0530
Subject: [PATCH] boards: shield: nxp_m2_wifi_bt: Updated reg domain

Set regulatory domain to default US for IW610 and RW610 socs
and WW for IW416 and IW612 socs.

Signed-off-by: Abhinav Kulkarni <abhinav.kulkarni@nxp.com>
---
 .../shields/nxp_m2_wifi_bt/Kconfig.defconfig  | 21 +++++++++++++++++++
 soc/nxp/rw/Kconfig.defconfig.wifi             | 13 ++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/boards/shields/nxp_m2_wifi_bt/Kconfig.defconfig b/boards/shields/nxp_m2_wifi_bt/Kconfig.defconfig
index 0b93ae90e30..5caf7a3ca67 100644
--- a/boards/shields/nxp_m2_wifi_bt/Kconfig.defconfig
+++ b/boards/shields/nxp_m2_wifi_bt/Kconfig.defconfig
@@ -24,6 +24,13 @@ choice NXP_IW416_MODULE
 	default NXP_IW416_MURATA_1XK_M2
 endchoice
 
+if WIFI_NM_HOSTAPD_AP
+
+config WIFI_NM_HOSTAPD_REGULATORY_REGION
+	default "WW"
+
+endif # WIFI_NM_HOSTAPD_AP
+
 endif # WIFI
 
 endif # SHIELD_NXP_M2_1XK_WIFI_BT
@@ -51,6 +58,13 @@ choice NXP_IW61X_MODULE
 	default NXP_IW612_MURATA_2EL_M2
 endchoice
 
+if WIFI_NM_HOSTAPD_AP
+
+config WIFI_NM_HOSTAPD_REGULATORY_REGION
+	default "WW"
+
+endif # WIFI_NM_HOSTAPD_AP
+
 endif # WIFI
 
 endif # SHIELD_NXP_M2_2EL_WIFI_BT
@@ -78,6 +92,13 @@ choice NXP_IW610_MODULE
 	default NXP_IW610_MURATA_2LL_M2
 endchoice
 
+if WIFI_NM_HOSTAPD_AP
+
+config WIFI_NM_HOSTAPD_REGULATORY_REGION
+	default "US"
+
+endif # WIFI_NM_HOSTAPD_AP
+
 endif # WIFI
 
 endif # SHIELD_NXP_M2_2LL_WIFI_BT
diff --git a/soc/nxp/rw/Kconfig.defconfig.wifi b/soc/nxp/rw/Kconfig.defconfig.wifi
index 7d4d4453137..97c490129b5 100644
--- a/soc/nxp/rw/Kconfig.defconfig.wifi
+++ b/soc/nxp/rw/Kconfig.defconfig.wifi
@@ -2,16 +2,29 @@
 # SPDX-License-Identifier: Apache-2.0
 
 if NETWORKING
+
 if NET_DHCPV4_SERVER
+
 config NET_DHCPV4_SERVER_ADDR_COUNT
 	default 32
 
 config NET_DHCPV4_SERVER_ICMP_PROBE_TIMEOUT
 	default 100
+
 endif # NET_DHCPV4_SERVER
 
 if NET_L2_WIFI_MGMT
+
 config WIFI_MGMT_AP_MAX_NUM_STA
 	default 8 if NXP_WIFI_SOFTAP_SUPPORT
+
 endif # NET_L2_WIFI_MGMT
+
 endif # NETWORKING
+
+if WIFI_NM_HOSTAPD_AP
+
+config WIFI_NM_HOSTAPD_REGULATORY_REGION
+	default "US"
+
+endif # WIFI_NM_HOSTAPD_AP