From patchwork Sun Jun 25 15:43:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Larry Finger X-Patchwork-Id: 9808207 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 CCADC60329 for ; Sun, 25 Jun 2017 15:43:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BC24B2852D for ; Sun, 25 Jun 2017 15:43:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B000628662; Sun, 25 Jun 2017 15:43:58 +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=-4.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID, URIBL_BLACK 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 56FB52852D for ; Sun, 25 Jun 2017 15:43:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751327AbdFYPn5 (ORCPT ); Sun, 25 Jun 2017 11:43:57 -0400 Received: from mail-ot0-f195.google.com ([74.125.82.195]:33124 "EHLO mail-ot0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751208AbdFYPnx (ORCPT ); Sun, 25 Jun 2017 11:43:53 -0400 Received: by mail-ot0-f195.google.com with SMTP id q16so9327901otb.0 for ; Sun, 25 Jun 2017 08:43:52 -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=MbBdDWUKOEow0rmq+fw42Sw63Oef7WSJP94dkK085RA=; b=IhnUJspsCI9Qc2dwcu2tSgpFUoYi4J1mhBgiFvmvwS3pTMHgjHMfgpbAgqMlSnXgFv dBmZvn9b6yASZ+FCdT2rI9UqPzpR/P5wy564PcjQHpXce8Eb8WaqfDzQPYiUv66bM0ri H4OXJQt1nrFR9vF0RGOhFAxG6x7MbZOQWPcRydYEm7KkCt99i0MR+k/k0575fMe43wV2 QpDRbkKWtVmDVXaSJNDC7/48hZ7aDQDj6g2O8gdgSNviuQCW/KPsM0hRBwQWNy7jHgpP qTBMCkH7XjBblaAVMaLjWRylln9v1CJbBChl5m7LBsDHC2390IAP9ToX38fejDyKvH6l qvmQ== 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=MbBdDWUKOEow0rmq+fw42Sw63Oef7WSJP94dkK085RA=; b=q/o3miCPHLT7mrU4RdXDuYgP9kHxVqLabxJGln7EYSSU4zsMfxAeJ7CldJ0RJkimmQ LOXocMyQklj46Vz5TtJ80LDv8fK1PkeMQyu7Q0mjBoOtbvNbMc7qD3MRAncGJoNhXDrV Q74+Wmgk9xjRjaw0qRRUhHIyETtv70KJwQXOLJHGrDCEuPLGo5XHxgAx+p0RINweLCjJ qJhMxLTDYP3tgnfMUSzhtyCc3af6N+fZmtCYkmEKWocrZidNiF9ohC2SBaT8aXxEV95d mwd77hxb0aOmj9JsUUG3hwdXKsrYegqR1kUoB9125gxKv+T8kx1yPWUnz4gIMiZ5Jd1C cg2Q== X-Gm-Message-State: AKS2vOyU6JEpaTvteed33cW826DHoZaDiOhNYE1V6HH1M8HVcOaqyopJ 4FVIWyOPOBnlrw== X-Received: by 10.157.54.245 with SMTP id s50mr8894158otd.256.1498405432274; Sun, 25 Jun 2017 08:43:52 -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 p33sm5351379otc.49.2017.06.25.08.43.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 25 Jun 2017 08:43:51 -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 v2 03/10] rtlwifi: Add board type for 8723be and 8192ee Date: Sun, 25 Jun 2017 10:43:37 -0500 Message-Id: <20170625154344.19213-4-Larry.Finger@lwfinger.net> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20170625154344.19213-1-Larry.Finger@lwfinger.net> References: <20170625154344.19213-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 --- 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 */