Received: by 2002:a05:7412:3784:b0:e2:908c:2ebd with SMTP id jk4csp2465236rdb; Wed, 4 Oct 2023 01:51:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IENQ4/LCHknzWxxWxt8fokJO0pJNA1jOX6Gj4p+ljQ0+xj5SVA6rIp1sbIMMhVESNRAhRUl X-Received: by 2002:a05:6a21:3391:b0:15a:4c23:870b with SMTP id yy17-20020a056a21339100b0015a4c23870bmr2296910pzb.23.1696409496941; Wed, 04 Oct 2023 01:51:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696409496; cv=none; d=google.com; s=arc-20160816; b=Xo2yQlG4MZOp3l0SyEvnZbNqmqHNYVpfgb4pT0EOO1Huy5cKqcFg2AKwmKKg88V/2v cwRDkp6D6Tu9taWvvtohwu6XTjVt1DgkNzNe1jdDh2HsasmA3jVLJ17ZhjF2okY7WrEE ri6rWNiMB68/hZNuQ4o6a8JCz/mEVh2/NkPvlewBP1awScS6vy1cLcR1mNSbliIzbwMi cq0fClpjN42A0he2SReeL8WXHhprk3UX6EPMW+oQsE2fkmaNcCB71ht0A98hu8677uEl YSCbhSsFi95sjB6rlQK2zhPFWXsRPCykESsslJ+QrRUMO6y8H+XrbcZV7ePUdbCHWJhB kyLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=YWP+d3/L7dLzKXosiWeSoXFjjhVMLufHKx9vDfXmsk0=; fh=TSuyMlfOTyCx0zt3ucDyTttlN37QPvmvgk5pf20rBgY=; b=FJIJd5uKxlhJElrDFdIZ472P5W4mirRwFOuBtPEJixzdDIYAQY/SEfFGm4fCakyytp mXj4W+355Liwe/chjQVI+6pwF0sPHm9bYMLTDBcmLP5li4nBAq9C16M7E8SwPX5Zv5Yw aPfknAYbRFOuiQa/5mH1c5+8gBViD6JCsZud2BBtyV9ldildYaVHUTXUkn3ox/qQ9nxv 0s7x8ktbvVLg24UL7GJaf6xBDROiNSrJl0LhKt2nKHCnYCRsl5jw+WjygIOEwVuFT1j2 vfj5R6Y+ZWd4biGwC5MrB0d3KDMRQ7fa94YEf/loPHbRN/Vn1OIfXQAuVld5TF4JCgC0 2+WA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Return-Path: Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id u24-20020a056a00099800b006935df3019esi3470491pfg.235.2023.10.04.01.51.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Oct 2023 01:51:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id A54AA8027F12; Wed, 4 Oct 2023 01:51:34 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241846AbjJDIva (ORCPT + 53 others); Wed, 4 Oct 2023 04:51:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41160 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232988AbjJDIv3 (ORCPT ); Wed, 4 Oct 2023 04:51:29 -0400 Received: from rtits2.realtek.com.tw (rtits2.realtek.com [211.75.126.72]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DCF70D7 for ; Wed, 4 Oct 2023 01:51:25 -0700 (PDT) X-SpamFilter-By: ArmorX SpamTrap 5.78 with qID 3948pBSc93164818, This message is accepted by code: ctloc85258 Received: from mail.realtek.com (rtexh36506.realtek.com.tw[172.21.6.27]) by rtits2.realtek.com.tw (8.15.2/2.92/5.92) with ESMTPS id 3948pBSc93164818 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 4 Oct 2023 16:51:11 +0800 Received: from RTEXMBS04.realtek.com.tw (172.21.6.97) by RTEXH36506.realtek.com.tw (172.21.6.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.17; Wed, 4 Oct 2023 16:51:11 +0800 Received: from [127.0.1.1] (172.21.69.25) by RTEXMBS04.realtek.com.tw (172.21.6.97) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.7; Wed, 4 Oct 2023 16:51:10 +0800 From: Ping-Ke Shih To: CC: , Subject: [PATCH 1/5] wifi: rtw88: regd: configure QATAR and UK Date: Wed, 4 Oct 2023 16:50:47 +0800 Message-ID: <20231004085051.205683-2-pkshih@realtek.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231004085051.205683-1-pkshih@realtek.com> References: <20231004085051.205683-1-pkshih@realtek.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [172.21.69.25] X-ClientProxiedBy: RTEXMBS02.realtek.com.tw (172.21.6.95) To RTEXMBS04.realtek.com.tw (172.21.6.97) X-KSE-ServerInfo: RTEXMBS04.realtek.com.tw, 9 X-KSE-AntiSpam-Interceptor-Info: fallback X-KSE-Antivirus-Interceptor-Info: fallback X-KSE-AntiSpam-Interceptor-Info: fallback X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Wed, 04 Oct 2023 01:51:34 -0700 (PDT) From: Zong-Zhe Yang 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 Signed-off-by: Ping-Ke Shih --- drivers/net/wireless/realtek/rtw88/main.h | 4 +++- drivers/net/wireless/realtek/rtw88/regd.c | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/realtek/rtw88/main.h b/drivers/net/wireless/realtek/rtw88/main.h index c42ef8294d59..86dc1516effa 100644 --- 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 2f547cbcf6da..680d8f32fce6 100644 --- 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) -- 2.25.1