wifi: rtw88: regd: configure QATAR and UK

In newer Realtek parameter package, Realtek regd can configure
QATAR and UK individually. So, driver extends the regd enum.
Besides, driver configure alternative of them which will be
referenced when parameter package of a chip doesn't consider
QATAR and UK individually.

Signed-off-by: Zong-Zhe Yang <kevin_yang@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20231004085051.205683-2-pkshih@realtek.com

diff --git a/drivers/net/wireless/realtek/rtw88/main.h b/drivers/net/wireless/realtek/rtw88/main.h
index c42ef8294d59e4b94d0d5f9b8f6c21f7b45f722c..86dc1516effade61f25af539ba135ad78bd9af28 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/main.h
+++ b/drivers/net/wireless/realtek/rtw88/main.h
@@ -342,8 +342,10 @@ enum rtw_regulatory_domains {
        RTW_REGD_UKRAINE        = 7,
        RTW_REGD_MEXICO         = 8,
        RTW_REGD_CN             = 9,
-       RTW_REGD_WW,
+       RTW_REGD_QATAR          = 10,
+       RTW_REGD_UK             = 11,
 
+       RTW_REGD_WW,
        RTW_REGD_MAX
 };
 

diff --git a/drivers/net/wireless/realtek/rtw88/regd.c b/drivers/net/wireless/realtek/rtw88/regd.c
index 2f547cbcf6da5214f07d1c656ea7d1fae6755548..680d8f32fce6c1235d6a86c064e67e857775a9c2 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/regd.c
+++ b/drivers/net/wireless/realtek/rtw88/regd.c
@@ -519,6 +519,8 @@ rtw_regd_alt[RTW_REGD_MAX] = {
        DECL_REGD_ALT(RTW_REGD_UKRAINE, RTW_REGD_ETSI),
        DECL_REGD_ALT(RTW_REGD_MEXICO, RTW_REGD_FCC),
        DECL_REGD_ALT(RTW_REGD_CN, RTW_REGD_ETSI),
+       DECL_REGD_ALT(RTW_REGD_QATAR, RTW_REGD_ETSI),
+       DECL_REGD_ALT(RTW_REGD_UK, RTW_REGD_ETSI),
 };
 
 bool rtw_regd_has_alt(u8 regd, u8 *regd_alt)