wifi: rtw88: regd: update regulatory map to R64-R42

Sync Realtek Regulatory R42 and Realtek Channel Plan R64.
Start to configure with Realtek regd CHILE, CN, UK, QATAR, UKRAINE.

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-5-pkshih@realtek.com

diff --git a/drivers/net/wireless/realtek/rtw88/regd.c b/drivers/net/wireless/realtek/rtw88/regd.c
index 680d8f32fce6c1235d6a86c064e67e857775a9c2..124fc7ae6a147630673571774a11a3686c424487 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/regd.c
+++ b/drivers/net/wireless/realtek/rtw88/regd.c
@@ -70,16 +70,16 @@ static const struct rtw_regulatory rtw_reg_map[] = {
        COUNTRY_REGD_ENT("BY", RTW_REGD_ETSI, RTW_REGD_ETSI),
        COUNTRY_REGD_ENT("BZ", RTW_REGD_FCC, RTW_REGD_FCC),
        COUNTRY_REGD_ENT("CA", RTW_REGD_IC, RTW_REGD_IC),
-       COUNTRY_REGD_ENT("CC", RTW_REGD_ETSI, RTW_REGD_ETSI),
+       COUNTRY_REGD_ENT("CC", RTW_REGD_ACMA, RTW_REGD_ACMA),
        COUNTRY_REGD_ENT("CD", RTW_REGD_ETSI, RTW_REGD_ETSI),
        COUNTRY_REGD_ENT("CF", RTW_REGD_ETSI, RTW_REGD_ETSI),
        COUNTRY_REGD_ENT("CG", RTW_REGD_ETSI, RTW_REGD_ETSI),
        COUNTRY_REGD_ENT("CH", RTW_REGD_ETSI, RTW_REGD_ETSI),
        COUNTRY_REGD_ENT("CI", RTW_REGD_ETSI, RTW_REGD_ETSI),
        COUNTRY_REGD_ENT("CK", RTW_REGD_ETSI, RTW_REGD_ETSI),
-       COUNTRY_REGD_ENT("CL", RTW_REGD_FCC, RTW_REGD_FCC),
+       COUNTRY_REGD_ENT("CL", RTW_REGD_CHILE, RTW_REGD_CHILE),
        COUNTRY_REGD_ENT("CM", RTW_REGD_ETSI, RTW_REGD_ETSI),
-       COUNTRY_REGD_ENT("CN", RTW_REGD_ETSI, RTW_REGD_ETSI),
+       COUNTRY_REGD_ENT("CN", RTW_REGD_CN, RTW_REGD_CN),
        COUNTRY_REGD_ENT("CO", RTW_REGD_FCC, RTW_REGD_FCC),
        COUNTRY_REGD_ENT("CR", RTW_REGD_FCC, RTW_REGD_FCC),
        COUNTRY_REGD_ENT("CV", RTW_REGD_ETSI, RTW_REGD_ETSI),
@@ -106,7 +106,7 @@ static const struct rtw_regulatory rtw_reg_map[] = {
        COUNTRY_REGD_ENT("FO", RTW_REGD_ETSI, RTW_REGD_ETSI),
        COUNTRY_REGD_ENT("FR", RTW_REGD_ETSI, RTW_REGD_ETSI),
        COUNTRY_REGD_ENT("GA", RTW_REGD_ETSI, RTW_REGD_ETSI),
-       COUNTRY_REGD_ENT("GB", RTW_REGD_ETSI, RTW_REGD_ETSI),
+       COUNTRY_REGD_ENT("GB", RTW_REGD_UK, RTW_REGD_UK),
        COUNTRY_REGD_ENT("GD", RTW_REGD_FCC, RTW_REGD_FCC),
        COUNTRY_REGD_ENT("GE", RTW_REGD_ETSI, RTW_REGD_ETSI),
        COUNTRY_REGD_ENT("GF", RTW_REGD_ETSI, RTW_REGD_ETSI),
@@ -214,7 +214,7 @@ static const struct rtw_regulatory rtw_reg_map[] = {
        COUNTRY_REGD_ENT("PT", RTW_REGD_ETSI, RTW_REGD_ETSI),
        COUNTRY_REGD_ENT("PW", RTW_REGD_FCC, RTW_REGD_FCC),
        COUNTRY_REGD_ENT("PY", RTW_REGD_FCC, RTW_REGD_FCC),
-       COUNTRY_REGD_ENT("QA", RTW_REGD_ETSI, RTW_REGD_ETSI),
+       COUNTRY_REGD_ENT("QA", RTW_REGD_QATAR, RTW_REGD_QATAR),
        COUNTRY_REGD_ENT("RE", RTW_REGD_ETSI, RTW_REGD_ETSI),
        COUNTRY_REGD_ENT("RO", RTW_REGD_ETSI, RTW_REGD_ETSI),
        COUNTRY_REGD_ENT("RS", RTW_REGD_ETSI, RTW_REGD_ETSI),
@@ -234,7 +234,7 @@ static const struct rtw_regulatory rtw_reg_map[] = {
        COUNTRY_REGD_ENT("SN", RTW_REGD_ETSI, RTW_REGD_ETSI),
        COUNTRY_REGD_ENT("SO", RTW_REGD_ETSI, RTW_REGD_ETSI),
        COUNTRY_REGD_ENT("SR", RTW_REGD_FCC, RTW_REGD_FCC),
-       COUNTRY_REGD_ENT("ST", RTW_REGD_FCC, RTW_REGD_FCC),
+       COUNTRY_REGD_ENT("ST", RTW_REGD_ETSI, RTW_REGD_ETSI),
        COUNTRY_REGD_ENT("SV", RTW_REGD_FCC, RTW_REGD_FCC),
        COUNTRY_REGD_ENT("SX", RTW_REGD_FCC, RTW_REGD_FCC),
        COUNTRY_REGD_ENT("SZ", RTW_REGD_ETSI, RTW_REGD_ETSI),
@@ -253,7 +253,7 @@ static const struct rtw_regulatory rtw_reg_map[] = {
        COUNTRY_REGD_ENT("TV", RTW_REGD_ETSI, RTW_REGD_WW),
        COUNTRY_REGD_ENT("TW", RTW_REGD_FCC, RTW_REGD_FCC),
        COUNTRY_REGD_ENT("TZ", RTW_REGD_ETSI, RTW_REGD_ETSI),
-       COUNTRY_REGD_ENT("UA", RTW_REGD_ETSI, RTW_REGD_ETSI),
+       COUNTRY_REGD_ENT("UA", RTW_REGD_UKRAINE, RTW_REGD_UKRAINE),
        COUNTRY_REGD_ENT("UG", RTW_REGD_ETSI, RTW_REGD_ETSI),
        COUNTRY_REGD_ENT("US", RTW_REGD_FCC, RTW_REGD_FCC),
        COUNTRY_REGD_ENT("UY", RTW_REGD_FCC, RTW_REGD_FCC),