From patchwork Wed Jun 28 15:12:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Larry Finger X-Patchwork-Id: 9814607 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 83C5B603F2 for ; Wed, 28 Jun 2017 15:14:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 76896285EA for ; Wed, 28 Jun 2017 15:14:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6B52E285EE; Wed, 28 Jun 2017 15:14:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D7FF028517 for ; Wed, 28 Jun 2017 15:14:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751658AbdF1PNb (ORCPT ); Wed, 28 Jun 2017 11:13:31 -0400 Received: from mail-oi0-f65.google.com ([209.85.218.65]:34428 "EHLO mail-oi0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752787AbdF1PMn (ORCPT ); Wed, 28 Jun 2017 11:12:43 -0400 Received: by mail-oi0-f65.google.com with SMTP id d77so5797681oig.1 for ; Wed, 28 Jun 2017 08:12:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=nL3wewvi4ThMIsR7FUwK7wk7J1d/t+4PXn17GHOxCVI=; b=fYRwvQ7aWMl9v1sv9t/iRZ0fcDyERXBY4gk2xjOv3jmALu+Q75CttoFz+PZ3a0M6AU 6HVbqf+yOEwan66wpjwyEs17XtsKbB9j5zicSmjCJSVDjufaR1e47zG9d6RqTxfhgC/G yZONEh5b19s04PgBRnBJY+Bvo0EYaWi4HkKGFmMmWJStvxf2XrmJdQC9WmEXPS+Ixwro t6JIKOzhyJydtBd6qGFwSO/bHpXTmQlPwNaxmyPxme7iKeIlxztITXHJhWTuRYnrwA0S /u5rK7EMEp5JhdkBwBx9gQICdKSxAdi8hurYEzaJMIMW2pr9UZKVahjmph4ZARDnbDNt c6Sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=nL3wewvi4ThMIsR7FUwK7wk7J1d/t+4PXn17GHOxCVI=; b=Yprgy0cOYIumocIyXnSSba+awhENccZ3UuhpYDnZLyDbbCyWLRuq2ZSlOPC2C9sGiY Pnd80385KUzifuSCRePdTflBlNUUFuR5jm6ZI5+X4Ye12SnvrqxImypKBml8z8DaMrMb p5COV1oq4J+wijVv0hUX142sMEzZRbJDS1ogsJBjvmfEpGPQgPGoKlFP6jNVLpiWLfTD FubCKFPygrqPSuRc+IhhfBlSFeN2nBEGtwwBRCAqYqTT3aVux87/1pEpp/xf5nD6lWsa nS9KuTpq4yRPHD6cL7ltEKkfI4VWCOlNJrF8Xf8etry5bbHqmzZqZza5AOLj45xPdteO zYuA== X-Gm-Message-State: AKS2vOxsg/SyXpqavMljvA984/IS5O1ab5yeCWA9/UxBRbUuYEpEniYG p4pUer04cS/zAQ== X-Received: by 10.202.98.197 with SMTP id w188mr5861346oib.191.1498662757432; Wed, 28 Jun 2017 08:12:37 -0700 (PDT) Received: from linux-4v1g.suse (cpe-24-31-249-175.kc.res.rr.com. [24.31.249.175]) by smtp.gmail.com with ESMTPSA id x74sm3805951oia.23.2017.06.28.08.12.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 28 Jun 2017 08:12:36 -0700 (PDT) From: Larry Finger To: kvalo@codeaurora.org Cc: linux-wireless@vger.kernel.org, Ping-Ke Shih , Larry Finger , Yan-Hsuan Chuang , Birming Chiu , Shaofu , Steven Ting Subject: [PATCH v3 03/10] rtlwifi: Add board type for 8723be and 8192ee Date: Wed, 28 Jun 2017 10:12:18 -0500 Message-Id: <20170628151225.22190-4-Larry.Finger@lwfinger.net> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20170628151225.22190-1-Larry.Finger@lwfinger.net> References: <20170628151225.22190-1-Larry.Finger@lwfinger.net> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Ping-Ke Shih With correct board_type, the phy praser can choose correct parameters. Signed-off-by: Ping-Ke Shih Signed-off-by: Larry Finger Cc: Yan-Hsuan Chuang Cc: Birming Chiu Cc: Shaofu Cc: Steven Ting --- v2 - no changes v3 - no changes --- drivers/net/wireless/realtek/rtlwifi/rtl8192ee/hw.c | 5 +++++ drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/hw.c index d84ac7adfd82..ef9394be7016 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/hw.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/hw.c @@ -2133,7 +2133,12 @@ static void _rtl92ee_read_adapter_info(struct ieee80211_hw *hw) if ((*(u8 *)&hwinfo[EEPROM_RF_BOARD_OPTION_92E]) == 0xFF) rtlefuse->board_type = 0; + if (rtlpriv->btcoexist.btc_info.btcoexist == 1) + rtlefuse->board_type |= BIT(2); /* ODM_BOARD_BT */ + rtlhal->board_type = rtlefuse->board_type; + RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, + "board_type = 0x%x\n", rtlefuse->board_type); /*parse xtal*/ rtlefuse->crystalcap = hwinfo[EEPROM_XTAL_92E]; if (hwinfo[EEPROM_XTAL_92E] == 0xFF) diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c index 2a7ad5ffe997..0b9366e7acbd 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c @@ -2114,6 +2114,13 @@ static void _rtl8723be_read_adapter_info(struct ieee80211_hw *hw, rtlefuse->autoload_failflag, hwinfo); + if (rtlpriv->btcoexist.btc_info.btcoexist == 1) + rtlefuse->board_type |= BIT(2); /* ODM_BOARD_BT */ + + rtlhal->board_type = rtlefuse->board_type; + RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, + "board_type = 0x%x\n", rtlefuse->board_type); + rtlhal->package_type = _rtl8723be_read_package_type(hw); /* set channel plan from efuse */